mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #4840
721aacd8
easylogging++: faster access to logging (moneromooo-monero)7cc27b36
Revert "easylogging++: make the logger handle early/late logging" (moneromooo-monero)
This commit is contained in:
commit
5123749d79
3 changed files with 18 additions and 14 deletions
|
@ -17,3 +17,12 @@
|
|||
fun:maybe_unlock_and_signal_one<boost::asio::detail::scoped_lock<boost::asio::detail::posix_mutex> >
|
||||
...
|
||||
}
|
||||
|
||||
{
|
||||
we leak the logger, for performance reasons in on-the-fly init
|
||||
Memcheck:Leak
|
||||
match-leak-kinds: definite
|
||||
fun:_Znwm
|
||||
fun:_ZN2el4base7Storage7getELPPEv
|
||||
...
|
||||
}
|
||||
|
|
14
external/easylogging++/easylogging++.cc
vendored
14
external/easylogging++/easylogging++.cc
vendored
|
@ -2191,16 +2191,11 @@ void VRegistry::setFromArgs(const base::utils::CommandLineArgs* commandLineArgs)
|
|||
# define ELPP_DEFAULT_LOGGING_FLAGS 0x0
|
||||
#endif // !defined(ELPP_DEFAULT_LOGGING_FLAGS)
|
||||
// Storage
|
||||
el::base::type::StoragePointer getresetELPP(bool reset)
|
||||
el::base::type::StoragePointer &el::base::Storage::getELPP()
|
||||
{
|
||||
static el::base::type::StoragePointer p(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder())));
|
||||
if (reset)
|
||||
p = NULL;
|
||||
return p;
|
||||
}
|
||||
el::base::type::StoragePointer el::base::Storage::getELPP()
|
||||
{
|
||||
return getresetELPP(false);
|
||||
if (!el::base::elStorage)
|
||||
el::base::elStorage = new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder()));
|
||||
return el::base::elStorage;
|
||||
}
|
||||
#if ELPP_ASYNC_LOGGING
|
||||
Storage::Storage(const LogBuilderPtr& defaultLogBuilder, base::IWorker* asyncDispatchWorker) :
|
||||
|
@ -2250,7 +2245,6 @@ Storage::Storage(const LogBuilderPtr& defaultLogBuilder) :
|
|||
|
||||
Storage::~Storage(void) {
|
||||
ELPP_INTERNAL_INFO(4, "Destroying storage");
|
||||
getresetELPP(true);
|
||||
#if ELPP_ASYNC_LOGGING
|
||||
ELPP_INTERNAL_INFO(5, "Replacing log dispatch callback to synchronous");
|
||||
uninstallLogDispatchCallback<base::AsyncLogDispatchCallback>(std::string("AsyncLogDispatchCallback"));
|
||||
|
|
9
external/easylogging++/easylogging++.h
vendored
9
external/easylogging++/easylogging++.h
vendored
|
@ -552,7 +552,7 @@ typedef std::ostream ostream_t;
|
|||
typedef unsigned int EnumType;
|
||||
typedef unsigned short VerboseLevel;
|
||||
typedef unsigned long int LineNumber;
|
||||
typedef std::shared_ptr<base::Storage> StoragePointer;
|
||||
typedef base::Storage *StoragePointer;
|
||||
typedef std::shared_ptr<LogDispatchCallback> LogDispatchCallbackPtr;
|
||||
typedef std::shared_ptr<PerformanceTrackingCallback> PerformanceTrackingCallbackPtr;
|
||||
typedef std::shared_ptr<LoggerRegistrationCallback> LoggerRegistrationCallbackPtr;
|
||||
|
@ -2734,7 +2734,7 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
|
|||
return it->second;
|
||||
}
|
||||
|
||||
static el::base::type::StoragePointer getELPP();
|
||||
static el::base::type::StoragePointer &getELPP();
|
||||
|
||||
private:
|
||||
base::RegisteredHitCounters* m_registeredHitCounters;
|
||||
|
@ -4613,9 +4613,10 @@ el::base::debug::CrashHandler elCrashHandler(ELPP_USE_DEF_CRASH_HANDLER); \
|
|||
}
|
||||
|
||||
#if ELPP_ASYNC_LOGGING
|
||||
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(NULL)
|
||||
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder()),\
|
||||
new el::base::AsyncDispatchWorker()))
|
||||
#else
|
||||
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(NULL)
|
||||
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder())))
|
||||
#endif // ELPP_ASYNC_LOGGING
|
||||
#define INITIALIZE_NULL_EASYLOGGINGPP \
|
||||
namespace el {\
|
||||
|
|
Loading…
Reference in a new issue