From 26aa9f88a4379d6d891e465bebfdba838dc0a552 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 7 Jul 2017 15:00:25 -0700 Subject: LogManager: clean up header --- Source/Core/Common/Logging/LogManager.cpp | 221 +++++++++++++++++++++--------- 1 file changed, 153 insertions(+), 68 deletions(-) (limited to 'Source/Core/Common/Logging/LogManager.cpp') diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 2aef9318e7..89522971ad 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -6,9 +6,9 @@ #include #include #include -#include #include +#include "Common/BitSet.h" #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" @@ -18,6 +18,65 @@ #include "Common/StringUtil.h" #include "Common/Timer.h" +constexpr size_t MAX_MSGLEN = 1024; + +class FileLogListener : public LogListener +{ +public: + FileLogListener(const std::string& filename) + { + File::OpenFStream(m_logfile, filename, std::ios::app); + SetEnable(true); + } + + void Log(LogTypes::LOG_LEVELS, const char* msg) override + { + if (!IsEnabled() || !IsValid()) + return; + + std::lock_guard lk(m_log_lock); + m_logfile << msg << std::flush; + } + + bool IsValid() const { return m_logfile.good(); } + bool IsEnabled() const { return m_enable; } + void SetEnable(bool enable) { m_enable = enable; } + // const char* GetName() const { return "file"; } +private: + std::mutex m_log_lock; + std::ofstream m_logfile; + bool m_enable; +}; + +class LogContainer +{ +public: + LogContainer(const std::string& short_name, const std::string& full_name, bool enable = false) + : m_full_name(full_name), m_short_name(short_name), m_enable(enable), + m_level(LogTypes::LWARNING) + { + } + + std::string GetShortName() const { return m_short_name; } + std::string GetFullName() const { return m_full_name; } + void AddListener(LogListener::LISTENER id) { m_listener_ids[id] = 1; } + void RemoveListener(LogListener::LISTENER id) { m_listener_ids[id] = 0; } + bool IsEnabled() const { return m_enable; } + void SetEnable(bool enable) { m_enable = enable; } + LogTypes::LOG_LEVELS GetLevel() const { return m_level; } + void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; } + bool HasListeners() const { return bool(m_listener_ids); } + typedef class BitSet32::Iterator iterator; + iterator begin() const { return m_listener_ids.begin(); } + iterator end() const { return m_listener_ids.end(); } +private: + std::string m_full_name; + std::string m_short_name; + bool m_enable; + LogTypes::LOG_LEVELS m_level; + BitSet32 m_listener_ids; +}; + void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, const char* fmt, ...) { @@ -28,8 +87,6 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* va_end(args); } -LogManager* LogManager::m_logManager = nullptr; - static size_t DeterminePathCutOffPoint() { constexpr const char* pattern = DIR_SEP "Source" DIR_SEP "Core" DIR_SEP; @@ -42,53 +99,53 @@ static size_t DeterminePathCutOffPoint() LogManager::LogManager() { // create log containers - m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); - m_Log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator"); - m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "Audio Interface (AI)"); - m_Log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot"); - m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc"); - m_Log[LogTypes::COMMON] = new LogContainer("COMMON", "Common"); - m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console"); - m_Log[LogTypes::CORE] = new LogContainer("CORE", "Core"); - m_Log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO"); - m_Log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE"); - m_Log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE"); - m_Log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails"); - m_Log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface"); - m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVD Interface"); - m_Log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler"); - m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "Expansion Interface"); - m_Log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor"); - m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub"); - m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo"); - m_Log[LogTypes::HOST_GPU] = new LogContainer("Host GPU", "Host GPU"); - m_Log[LogTypes::IOS] = new LogContainer("IOS", "IOS"); - m_Log[LogTypes::IOS_DI] = new LogContainer("IOS_DI", "IOS - Drive Interface"); - m_Log[LogTypes::IOS_ES] = new LogContainer("IOS_ES", "IOS - ETicket Services"); - m_Log[LogTypes::IOS_FILEIO] = new LogContainer("IOS_FILEIO", "IOS - FileIO"); - m_Log[LogTypes::IOS_SD] = new LogContainer("IOS_SD", "IOS - SDIO"); - m_Log[LogTypes::IOS_SSL] = new LogContainer("IOS_SSL", "IOS - SSL"); - m_Log[LogTypes::IOS_STM] = new LogContainer("IOS_STM", "IOS - State Transition Manager"); - m_Log[LogTypes::IOS_NET] = new LogContainer("IOS_NET", "IOS - Network"); - m_Log[LogTypes::IOS_USB] = new LogContainer("IOS_USB", "IOS - USB"); - m_Log[LogTypes::IOS_WC24] = new LogContainer("IOS_WC24", "IOS - WiiConnect24"); - m_Log[LogTypes::IOS_WIIMOTE] = new LogContainer("IOS_WIIMOTE", "IOS - Wii Remote"); - m_Log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log"); - m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); - m_Log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap"); - m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); - m_Log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE"); - m_Log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport"); - m_Log[LogTypes::PAD] = new LogContainer("PAD", "Pad"); - m_Log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine"); - m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt"); - m_Log[LogTypes::POWERPC] = new LogContainer("PowerPC", "IBM CPU"); - m_Log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "Serial Interface (SI)"); - m_Log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1"); - m_Log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend"); - m_Log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "Video Interface (VI)"); - m_Log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote"); - m_Log[LogTypes::WII_IPC] = new LogContainer("WII_IPC", "WII IPC"); + m_log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); + m_log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator"); + m_log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "Audio Interface (AI)"); + m_log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot"); + m_log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc"); + m_log[LogTypes::COMMON] = new LogContainer("COMMON", "Common"); + m_log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console"); + m_log[LogTypes::CORE] = new LogContainer("CORE", "Core"); + m_log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO"); + m_log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE"); + m_log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE"); + m_log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails"); + m_log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface"); + m_log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVD Interface"); + m_log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler"); + m_log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "Expansion Interface"); + m_log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor"); + m_log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub"); + m_log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo"); + m_log[LogTypes::HOST_GPU] = new LogContainer("Host GPU", "Host GPU"); + m_log[LogTypes::IOS] = new LogContainer("IOS", "IOS"); + m_log[LogTypes::IOS_DI] = new LogContainer("IOS_DI", "IOS - Drive Interface"); + m_log[LogTypes::IOS_ES] = new LogContainer("IOS_ES", "IOS - ETicket Services"); + m_log[LogTypes::IOS_FILEIO] = new LogContainer("IOS_FILEIO", "IOS - FileIO"); + m_log[LogTypes::IOS_SD] = new LogContainer("IOS_SD", "IOS - SDIO"); + m_log[LogTypes::IOS_SSL] = new LogContainer("IOS_SSL", "IOS - SSL"); + m_log[LogTypes::IOS_STM] = new LogContainer("IOS_STM", "IOS - State Transition Manager"); + m_log[LogTypes::IOS_NET] = new LogContainer("IOS_NET", "IOS - Network"); + m_log[LogTypes::IOS_USB] = new LogContainer("IOS_USB", "IOS - USB"); + m_log[LogTypes::IOS_WC24] = new LogContainer("IOS_WC24", "IOS - WiiConnect24"); + m_log[LogTypes::IOS_WIIMOTE] = new LogContainer("IOS_WIIMOTE", "IOS - Wii Remote"); + m_log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log"); + m_log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); + m_log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap"); + m_log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); + m_log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE"); + m_log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport"); + m_log[LogTypes::PAD] = new LogContainer("PAD", "Pad"); + m_log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine"); + m_log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt"); + m_log[LogTypes::POWERPC] = new LogContainer("PowerPC", "IBM CPU"); + m_log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "Serial Interface (SI)"); + m_log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1"); + m_log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend"); + m_log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "Video Interface (VI)"); + m_log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote"); + m_log[LogTypes::WII_IPC] = new LogContainer("WII_IPC", "WII IPC"); RegisterListener(LogListener::FILE_LISTENER, new FileLogListener(File::GetUserPath(F_MAINLOG_IDX))); @@ -115,7 +172,7 @@ LogManager::LogManager() if (verbosity > MAX_LOGLEVEL) verbosity = MAX_LOGLEVEL; - for (LogContainer* container : m_Log) + for (LogContainer* container : m_log) { bool enable; logs->Get(container->GetShortName(), &enable, false); @@ -134,7 +191,7 @@ LogManager::LogManager() LogManager::~LogManager() { - for (LogContainer* container : m_Log) + for (LogContainer* container : m_log) delete container; // The log window listener pointer is owned by the GUI code. @@ -152,7 +209,7 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE const char* file, int line, const char* format, va_list args) { char temp[MAX_MSGLEN]; - LogContainer* log = m_Log[type]; + LogContainer* log = m_log[type]; if (!log->IsEnabled() || level > log->GetLevel() || !log->HasListeners()) return; @@ -168,33 +225,61 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE m_listeners[listener_id]->Log(level, msg.c_str()); } -void LogManager::Init() +void LogManager::SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level) { - m_logManager = new LogManager(); + m_log[type]->SetLevel(level); } -void LogManager::Shutdown() +void LogManager::SetEnable(LogTypes::LOG_TYPE type, bool enable) { - delete m_logManager; - m_logManager = nullptr; + m_log[type]->SetEnable(enable); } -LogContainer::LogContainer(const std::string& shortName, const std::string& fullName, bool enable) - : m_fullName(fullName), m_shortName(shortName), m_enable(enable), m_level(LogTypes::LWARNING) +bool LogManager::IsEnabled(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level) const { + return m_log[type]->IsEnabled() && m_log[type]->GetLevel() >= level; } -FileLogListener::FileLogListener(const std::string& filename) +std::string LogManager::GetShortName(LogTypes::LOG_TYPE type) const { - File::OpenFStream(m_logfile, filename, std::ios::app); - SetEnable(true); + return m_log[type]->GetShortName(); } -void FileLogListener::Log(LogTypes::LOG_LEVELS, const char* msg) +std::string LogManager::GetFullName(LogTypes::LOG_TYPE type) const { - if (!IsEnabled() || !IsValid()) - return; + return m_log[type]->GetFullName(); +} - std::lock_guard lk(m_log_lock); - m_logfile << msg << std::flush; +void LogManager::RegisterListener(LogListener::LISTENER id, LogListener* listener) +{ + m_listeners[id] = listener; +} + +void LogManager::AddListener(LogTypes::LOG_TYPE type, LogListener::LISTENER id) +{ + m_log[type]->AddListener(id); +} + +void LogManager::RemoveListener(LogTypes::LOG_TYPE type, LogListener::LISTENER id) +{ + m_log[type]->RemoveListener(id); +} + +// Singleton. Ugh. +static LogManager* s_log_manager; + +LogManager* LogManager::GetInstance() +{ + return s_log_manager; +} + +void LogManager::Init() +{ + s_log_manager = new LogManager(); +} + +void LogManager::Shutdown() +{ + delete s_log_manager; + s_log_manager = nullptr; } -- cgit v1.2.3 From 546fa628fbddd1b90d9332391bf21069ba0f5aee Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 7 Jul 2017 15:08:57 -0700 Subject: LogManager: remove per-container verbosities --- Source/Core/Common/Logging/LogManager.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'Source/Core/Common/Logging/LogManager.cpp') diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 89522971ad..7e73155c2e 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -52,8 +52,7 @@ class LogContainer { public: LogContainer(const std::string& short_name, const std::string& full_name, bool enable = false) - : m_full_name(full_name), m_short_name(short_name), m_enable(enable), - m_level(LogTypes::LWARNING) + : m_full_name(full_name), m_short_name(short_name), m_enable(enable) { } @@ -63,8 +62,6 @@ public: void RemoveListener(LogListener::LISTENER id) { m_listener_ids[id] = 0; } bool IsEnabled() const { return m_enable; } void SetEnable(bool enable) { m_enable = enable; } - LogTypes::LOG_LEVELS GetLevel() const { return m_level; } - void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; } bool HasListeners() const { return bool(m_listener_ids); } typedef class BitSet32::Iterator iterator; iterator begin() const { return m_listener_ids.begin(); } @@ -73,7 +70,6 @@ private: std::string m_full_name; std::string m_short_name; bool m_enable; - LogTypes::LOG_LEVELS m_level; BitSet32 m_listener_ids; }; @@ -172,12 +168,13 @@ LogManager::LogManager() if (verbosity > MAX_LOGLEVEL) verbosity = MAX_LOGLEVEL; + SetLogLevel(static_cast(verbosity)); + for (LogContainer* container : m_log) { bool enable; logs->Get(container->GetShortName(), &enable, false); container->SetEnable(enable); - container->SetLevel(static_cast(verbosity)); if (enable && write_file) container->AddListener(LogListener::FILE_LISTENER); if (enable && write_console) @@ -211,7 +208,7 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE char temp[MAX_MSGLEN]; LogContainer* log = m_log[type]; - if (!log->IsEnabled() || level > log->GetLevel() || !log->HasListeners()) + if (!log->IsEnabled() || level > GetLogLevel() || !log->HasListeners()) return; CharArrayFromFormatV(temp, MAX_MSGLEN, format, args); @@ -225,9 +222,14 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE m_listeners[listener_id]->Log(level, msg.c_str()); } -void LogManager::SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level) +LogTypes::LOG_LEVELS LogManager::GetLogLevel() const +{ + return m_level; +} + +void LogManager::SetLogLevel(LogTypes::LOG_LEVELS level) { - m_log[type]->SetLevel(level); + m_level = level; } void LogManager::SetEnable(LogTypes::LOG_TYPE type, bool enable) @@ -237,7 +239,7 @@ void LogManager::SetEnable(LogTypes::LOG_TYPE type, bool enable) bool LogManager::IsEnabled(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level) const { - return m_log[type]->IsEnabled() && m_log[type]->GetLevel() >= level; + return m_log[type]->IsEnabled() && GetLogLevel() >= level; } std::string LogManager::GetShortName(LogTypes::LOG_TYPE type) const -- cgit v1.2.3 From 18da6dee8eb94e1e1fca6e0c64a7914213f21847 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 7 Jul 2017 15:23:47 -0700 Subject: LogManager: remove per-container listeners --- Source/Core/Common/Logging/LogManager.cpp | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'Source/Core/Common/Logging/LogManager.cpp') diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 7e73155c2e..56aeea9d27 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -8,7 +8,6 @@ #include #include -#include "Common/BitSet.h" #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" @@ -58,19 +57,12 @@ public: std::string GetShortName() const { return m_short_name; } std::string GetFullName() const { return m_full_name; } - void AddListener(LogListener::LISTENER id) { m_listener_ids[id] = 1; } - void RemoveListener(LogListener::LISTENER id) { m_listener_ids[id] = 0; } bool IsEnabled() const { return m_enable; } void SetEnable(bool enable) { m_enable = enable; } - bool HasListeners() const { return bool(m_listener_ids); } - typedef class BitSet32::Iterator iterator; - iterator begin() const { return m_listener_ids.begin(); } - iterator end() const { return m_listener_ids.end(); } private: std::string m_full_name; std::string m_short_name; bool m_enable; - BitSet32 m_listener_ids; }; void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, @@ -169,18 +161,15 @@ LogManager::LogManager() verbosity = MAX_LOGLEVEL; SetLogLevel(static_cast(verbosity)); + EnableListener(LogListener::FILE_LISTENER, write_file); + EnableListener(LogListener::CONSOLE_LISTENER, write_console); + EnableListener(LogListener::LOG_WINDOW_LISTENER, write_window); for (LogContainer* container : m_log) { bool enable; logs->Get(container->GetShortName(), &enable, false); container->SetEnable(enable); - if (enable && write_file) - container->AddListener(LogListener::FILE_LISTENER); - if (enable && write_console) - container->AddListener(LogListener::CONSOLE_LISTENER); - if (enable && write_window) - container->AddListener(LogListener::LOG_WINDOW_LISTENER); } m_path_cutoff_point = DeterminePathCutOffPoint(); @@ -208,7 +197,7 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE char temp[MAX_MSGLEN]; LogContainer* log = m_log[type]; - if (!log->IsEnabled() || level > GetLogLevel() || !log->HasListeners()) + if (!log->IsEnabled() || level > GetLogLevel() || !static_cast(m_listener_ids)) return; CharArrayFromFormatV(temp, MAX_MSGLEN, format, args); @@ -217,7 +206,7 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE "%s %s:%u %c[%s]: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, line, LogTypes::LOG_LEVEL_TO_CHAR[(int)level], log->GetShortName().c_str(), temp); - for (auto listener_id : *log) + for (auto listener_id : m_listener_ids) if (m_listeners[listener_id]) m_listeners[listener_id]->Log(level, msg.c_str()); } @@ -257,14 +246,14 @@ void LogManager::RegisterListener(LogListener::LISTENER id, LogListener* listene m_listeners[id] = listener; } -void LogManager::AddListener(LogTypes::LOG_TYPE type, LogListener::LISTENER id) +void LogManager::EnableListener(LogListener::LISTENER id, bool enable) { - m_log[type]->AddListener(id); + m_listener_ids[id] = enable; } -void LogManager::RemoveListener(LogTypes::LOG_TYPE type, LogListener::LISTENER id) +bool LogManager::IsListenerEnabled(LogListener::LISTENER id) const { - m_log[type]->RemoveListener(id); + return m_listener_ids[id]; } // Singleton. Ugh. -- cgit v1.2.3 From 8ff8dfcdf2b6a9dd6430db01a85326e1edcc0807 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 7 Jul 2017 15:40:19 -0700 Subject: LogManager: make LogContainer a POD and don't allocate --- Source/Core/Common/Logging/LogManager.cpp | 147 ++++++++++++------------------ 1 file changed, 60 insertions(+), 87 deletions(-) (limited to 'Source/Core/Common/Logging/LogManager.cpp') diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 56aeea9d27..1e8d50cd2d 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -47,24 +47,6 @@ private: bool m_enable; }; -class LogContainer -{ -public: - LogContainer(const std::string& short_name, const std::string& full_name, bool enable = false) - : m_full_name(full_name), m_short_name(short_name), m_enable(enable) - { - } - - std::string GetShortName() const { return m_short_name; } - std::string GetFullName() const { return m_full_name; } - bool IsEnabled() const { return m_enable; } - void SetEnable(bool enable) { m_enable = enable; } -private: - std::string m_full_name; - std::string m_short_name; - bool m_enable; -}; - void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, const char* fmt, ...) { @@ -87,53 +69,53 @@ static size_t DeterminePathCutOffPoint() LogManager::LogManager() { // create log containers - m_log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); - m_log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator"); - m_log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "Audio Interface (AI)"); - m_log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot"); - m_log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc"); - m_log[LogTypes::COMMON] = new LogContainer("COMMON", "Common"); - m_log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console"); - m_log[LogTypes::CORE] = new LogContainer("CORE", "Core"); - m_log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO"); - m_log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE"); - m_log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE"); - m_log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails"); - m_log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface"); - m_log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVD Interface"); - m_log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler"); - m_log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "Expansion Interface"); - m_log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor"); - m_log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub"); - m_log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo"); - m_log[LogTypes::HOST_GPU] = new LogContainer("Host GPU", "Host GPU"); - m_log[LogTypes::IOS] = new LogContainer("IOS", "IOS"); - m_log[LogTypes::IOS_DI] = new LogContainer("IOS_DI", "IOS - Drive Interface"); - m_log[LogTypes::IOS_ES] = new LogContainer("IOS_ES", "IOS - ETicket Services"); - m_log[LogTypes::IOS_FILEIO] = new LogContainer("IOS_FILEIO", "IOS - FileIO"); - m_log[LogTypes::IOS_SD] = new LogContainer("IOS_SD", "IOS - SDIO"); - m_log[LogTypes::IOS_SSL] = new LogContainer("IOS_SSL", "IOS - SSL"); - m_log[LogTypes::IOS_STM] = new LogContainer("IOS_STM", "IOS - State Transition Manager"); - m_log[LogTypes::IOS_NET] = new LogContainer("IOS_NET", "IOS - Network"); - m_log[LogTypes::IOS_USB] = new LogContainer("IOS_USB", "IOS - USB"); - m_log[LogTypes::IOS_WC24] = new LogContainer("IOS_WC24", "IOS - WiiConnect24"); - m_log[LogTypes::IOS_WIIMOTE] = new LogContainer("IOS_WIIMOTE", "IOS - Wii Remote"); - m_log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log"); - m_log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); - m_log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap"); - m_log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); - m_log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE"); - m_log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport"); - m_log[LogTypes::PAD] = new LogContainer("PAD", "Pad"); - m_log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine"); - m_log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt"); - m_log[LogTypes::POWERPC] = new LogContainer("PowerPC", "IBM CPU"); - m_log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "Serial Interface (SI)"); - m_log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1"); - m_log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend"); - m_log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "Video Interface (VI)"); - m_log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote"); - m_log[LogTypes::WII_IPC] = new LogContainer("WII_IPC", "WII IPC"); + m_log[LogTypes::ACTIONREPLAY] = {"ActionReplay", "ActionReplay"}; + m_log[LogTypes::AUDIO] = {"Audio", "Audio Emulator"}; + m_log[LogTypes::AUDIO_INTERFACE] = {"AI", "Audio Interface (AI)"}; + m_log[LogTypes::BOOT] = {"BOOT", "Boot"}; + m_log[LogTypes::COMMANDPROCESSOR] = {"CP", "CommandProc"}; + m_log[LogTypes::COMMON] = {"COMMON", "Common"}; + m_log[LogTypes::CONSOLE] = {"CONSOLE", "Dolphin Console"}; + m_log[LogTypes::CORE] = {"CORE", "Core"}; + m_log[LogTypes::DISCIO] = {"DIO", "Disc IO"}; + m_log[LogTypes::DSPHLE] = {"DSPHLE", "DSP HLE"}; + m_log[LogTypes::DSPLLE] = {"DSPLLE", "DSP LLE"}; + m_log[LogTypes::DSP_MAIL] = {"DSPMails", "DSP Mails"}; + m_log[LogTypes::DSPINTERFACE] = {"DSP", "DSPInterface"}; + m_log[LogTypes::DVDINTERFACE] = {"DVD", "DVD Interface"}; + m_log[LogTypes::DYNA_REC] = {"JIT", "Dynamic Recompiler"}; + m_log[LogTypes::EXPANSIONINTERFACE] = {"EXI", "Expansion Interface"}; + m_log[LogTypes::FILEMON] = {"FileMon", "File Monitor"}; + m_log[LogTypes::GDB_STUB] = {"GDB_STUB", "GDB Stub"}; + m_log[LogTypes::GPFIFO] = {"GP", "GPFifo"}; + m_log[LogTypes::HOST_GPU] = {"Host GPU", "Host GPU"}; + m_log[LogTypes::IOS] = {"IOS", "IOS"}; + m_log[LogTypes::IOS_DI] = {"IOS_DI", "IOS - Drive Interface"}; + m_log[LogTypes::IOS_ES] = {"IOS_ES", "IOS - ETicket Services"}; + m_log[LogTypes::IOS_FILEIO] = {"IOS_FILEIO", "IOS - FileIO"}; + m_log[LogTypes::IOS_SD] = {"IOS_SD", "IOS - SDIO"}; + m_log[LogTypes::IOS_SSL] = {"IOS_SSL", "IOS - SSL"}; + m_log[LogTypes::IOS_STM] = {"IOS_STM", "IOS - State Transition Manager"}; + m_log[LogTypes::IOS_NET] = {"IOS_NET", "IOS - Network"}; + m_log[LogTypes::IOS_USB] = {"IOS_USB", "IOS - USB"}; + m_log[LogTypes::IOS_WC24] = {"IOS_WC24", "IOS - WiiConnect24"}; + m_log[LogTypes::IOS_WIIMOTE] = {"IOS_WIIMOTE", "IOS - Wii Remote"}; + m_log[LogTypes::MASTER_LOG] = {"*", "Master Log"}; + m_log[LogTypes::MEMCARD_MANAGER] = {"MemCard Manager", "MemCard Manager"}; + m_log[LogTypes::MEMMAP] = {"MI", "MI & memmap"}; + m_log[LogTypes::NETPLAY] = {"NETPLAY", "Netplay"}; + m_log[LogTypes::OSHLE] = {"HLE", "HLE"}; + m_log[LogTypes::OSREPORT] = {"OSREPORT", "OSReport"}; + m_log[LogTypes::PAD] = {"PAD", "Pad"}; + m_log[LogTypes::PIXELENGINE] = {"PE", "PixelEngine"}; + m_log[LogTypes::PROCESSORINTERFACE] = {"PI", "ProcessorInt"}; + m_log[LogTypes::POWERPC] = {"PowerPC", "IBM CPU"}; + m_log[LogTypes::SERIALINTERFACE] = {"SI", "Serial Interface (SI)"}; + m_log[LogTypes::SP1] = {"SP1", "Serial Port 1"}; + m_log[LogTypes::VIDEO] = {"Video", "Video Backend"}; + m_log[LogTypes::VIDEOINTERFACE] = {"VI", "Video Interface (VI)"}; + m_log[LogTypes::WIIMOTE] = {"Wiimote", "Wiimote"}; + m_log[LogTypes::WII_IPC] = {"WII_IPC", "WII IPC"}; RegisterListener(LogListener::FILE_LISTENER, new FileLogListener(File::GetUserPath(F_MAINLOG_IDX))); @@ -165,21 +147,14 @@ LogManager::LogManager() EnableListener(LogListener::CONSOLE_LISTENER, write_console); EnableListener(LogListener::LOG_WINDOW_LISTENER, write_window); - for (LogContainer* container : m_log) - { - bool enable; - logs->Get(container->GetShortName(), &enable, false); - container->SetEnable(enable); - } + for (LogContainer& container : m_log) + logs->Get(container.m_short_name, &container.m_enable, false); m_path_cutoff_point = DeterminePathCutOffPoint(); } LogManager::~LogManager() { - for (LogContainer* container : m_log) - delete container; - // The log window listener pointer is owned by the GUI code. delete m_listeners[LogListener::CONSOLE_LISTENER]; delete m_listeners[LogListener::FILE_LISTENER]; @@ -194,17 +169,15 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, const char* format, va_list args) { - char temp[MAX_MSGLEN]; - LogContainer* log = m_log[type]; - - if (!log->IsEnabled() || level > GetLogLevel() || !static_cast(m_listener_ids)) + if (!IsEnabled(type, level) || !static_cast(m_listener_ids)) return; + char temp[MAX_MSGLEN]; CharArrayFromFormatV(temp, MAX_MSGLEN, format, args); - std::string msg = StringFromFormat( - "%s %s:%u %c[%s]: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, line, - LogTypes::LOG_LEVEL_TO_CHAR[(int)level], log->GetShortName().c_str(), temp); + std::string msg = + StringFromFormat("%s %s:%u %c[%s]: %s\n", Common::Timer::GetTimeFormatted().c_str(), file, + line, LogTypes::LOG_LEVEL_TO_CHAR[(int)level], GetShortName(type), temp); for (auto listener_id : m_listener_ids) if (m_listeners[listener_id]) @@ -223,22 +196,22 @@ void LogManager::SetLogLevel(LogTypes::LOG_LEVELS level) void LogManager::SetEnable(LogTypes::LOG_TYPE type, bool enable) { - m_log[type]->SetEnable(enable); + m_log[type].m_enable = enable; } bool LogManager::IsEnabled(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level) const { - return m_log[type]->IsEnabled() && GetLogLevel() >= level; + return m_log[type].m_enable && GetLogLevel() >= level; } -std::string LogManager::GetShortName(LogTypes::LOG_TYPE type) const +const char* LogManager::GetShortName(LogTypes::LOG_TYPE type) const { - return m_log[type]->GetShortName(); + return m_log[type].m_short_name; } -std::string LogManager::GetFullName(LogTypes::LOG_TYPE type) const +const char* LogManager::GetFullName(LogTypes::LOG_TYPE type) const { - return m_log[type]->GetFullName(); + return m_log[type].m_full_name; } void LogManager::RegisterListener(LogListener::LISTENER id, LogListener* listener) -- cgit v1.2.3 From c9e8289e82235cc0d0424f94f988ef20f9a66961 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 7 Jul 2017 16:10:38 -0700 Subject: LogManager: add SaveSettings --- Source/Core/Common/Logging/LogManager.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'Source/Core/Common/Logging/LogManager.cpp') diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 1e8d50cd2d..679e68f59b 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -160,6 +160,24 @@ LogManager::~LogManager() delete m_listeners[LogListener::FILE_LISTENER]; } +void LogManager::SaveSettings() +{ + IniFile ini; + ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX)); + + IniFile::Section* options = ini.GetOrCreateSection("Options"); + options->Set("Verbosity", GetLogLevel()); + options->Set("WriteToFile", m_listener_ids[LogListener::FILE_LISTENER]); + options->Set("WriteToConsole", m_listener_ids[LogListener::CONSOLE_LISTENER]); + options->Set("WriteToWindow", m_listener_ids[LogListener::LOG_WINDOW_LISTENER]); + + // Save all enabled/disabled states of the log types to the config ini. + for (const auto& container : m_log) + ini.GetOrCreateSection("Logs")->Set(container.m_short_name, container.m_enable); + + ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX)); +} + void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, const char* format, va_list args) { @@ -244,6 +262,8 @@ void LogManager::Init() void LogManager::Shutdown() { + if (s_log_manager) + s_log_manager->SaveSettings(); delete s_log_manager; s_log_manager = nullptr; } -- cgit v1.2.3