mirror of
https://github.com/monero-project/monero
synced 2025-10-06 08:42:47 +02:00
Fix logging lock, future optimizations may needed
This commit is contained in:
5
external/easylogging++/easylogging++.h
vendored
5
external/easylogging++/easylogging++.h
vendored
@@ -3263,12 +3263,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) {
|
||||||
@@ -3326,6 +3326,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);
|
||||||
|
Reference in New Issue
Block a user