Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-08 16:11:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10066

Browse Source 
36b12ed Fix logging lock, future optimizations may needed (Lee *!* Clagett)
This commit is contained in:
tobtoht 2025-09-24 20:51:55 +00:00
commit 2d1972299a
No known key found for this signature in database
GPG Key ID: E45B10DD027D2472
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/easylogging++/easylogging++.h vendored
View File

@ -3260,12 +3260,12 @@ class Writer : base::NoCopy {
const char* func, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog, const char* func, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog,
base::type::VerboseLevel verboseLevel = 0) : base::type::VerboseLevel verboseLevel = 0) :
m_msg(nullptr), m_level(level), m_color(color), m_file(file), m_line(line), m_func(func), m_verboseLevel(verboseLevel), m_msg(nullptr), m_level(level), m_color(color), m_file(file), m_line(line), m_func(func), m_verboseLevel(verboseLevel),
m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction) { m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction), m_sync(ELPP->lock()) {
} }
Writer(LogMessage* msg, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog) : Writer(LogMessage* msg, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog) :
m_msg(msg), m_level(msg != nullptr ? msg->level() : Level::Unknown), m_msg(msg), m_level(msg != nullptr ? msg->level() : Level::Unknown),
m_line(0), m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction) { m_line(0), m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction), m_sync(ELPP->lock()) {
} }
virtual ~Writer(void) { virtual ~Writer(void) {
@ -3323,6 +3323,7 @@ class Writer : base::NoCopy {
base::MessageBuilder m_messageBuilder; base::MessageBuilder m_messageBuilder;
base::DispatchAction m_dispatchAction; base::DispatchAction m_dispatchAction;
std::vector<std::string> m_loggerIds; std::vector<std::string> m_loggerIds;
base::threading::ScopedLock m_sync;
friend class el::Helpers; friend class el::Helpers;
void initializeLogger(const std::string& loggerId, bool lookup = true, bool needLock = true); void initializeLogger(const std::string& loggerId, bool lookup = true, bool needLock = true);