piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert LOG_TYPE and LOG_LEVELS to enum class

Browse Source
This commit is contained in:
Pokechu22
2021-10-21 12:11:07 -07:00
parent ba107819ec
commit 04d8cdfe88
46 changed files with 254 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Assert.h
View File

@ -21,7 +21,7 @@
#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \
do \
{ \
if constexpr (Common::Log::MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG) \
if constexpr (Common::Log::MAX_LOGLEVEL >= Common::Log::LogLevel::LDEBUG) \
{ \
if (!(_a_)) \
{ \
@ -43,6 +43,6 @@
#define DEBUG_ASSERT(_a_) \
do \
{ \
if constexpr (Common::Log::MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG) \
if constexpr (Common::Log::MAX_LOGLEVEL >= Common::Log::LogLevel::LDEBUG) \
ASSERT(_a_); \
} while (0)

2
Source/Core/Common/Logging/ConsoleListener.h
View File

@ -11,7 +11,7 @@ public:
ConsoleListener();
~ConsoleListener();
void Log(Common::Log::LOG_LEVELS level, const char* text) override;
void Log(Common::Log::LogLevel level, const char* text) override;
private:
bool m_use_color = false;

12
Source/Core/Common/Logging/ConsoleListenerDroid.cpp
View File

@ -13,26 +13,26 @@ ConsoleListener::~ConsoleListener()
{
}
void ConsoleListener::Log(Common::Log::LOG_LEVELS level, const char* text)
void ConsoleListener::Log(Common::Log::LogLevel level, const char* text)
{
android_LogPriority logLevel = ANDROID_LOG_UNKNOWN;
// Map dolphin's log levels to android's
switch (level)
{
case Common::Log::LOG_LEVELS::LDEBUG:
case Common::Log::LogLevel::LDEBUG:
logLevel = ANDROID_LOG_DEBUG;
break;
case Common::Log::LOG_LEVELS::LINFO:
case Common::Log::LogLevel::LINFO:
logLevel = ANDROID_LOG_INFO;
break;
case Common::Log::LOG_LEVELS::LWARNING:
case Common::Log::LogLevel::LWARNING:
logLevel = ANDROID_LOG_WARN;
break;
case Common::Log::LOG_LEVELS::LERROR:
case Common::Log::LogLevel::LERROR:
logLevel = ANDROID_LOG_ERROR;
break;
case Common::Log::LOG_LEVELS::LNOTICE:
case Common::Log::LogLevel::LNOTICE:
logLevel = ANDROID_LOG_INFO;
break;
}

8
Source/Core/Common/Logging/ConsoleListenerNix.cpp
View File

@ -21,7 +21,7 @@ ConsoleListener::~ConsoleListener()
fflush(nullptr);
}
void ConsoleListener::Log(Common::Log::LOG_LEVELS level, const char* text)
void ConsoleListener::Log(Common::Log::LogLevel level, const char* text)
{
char color_attr[16] = "";
char reset_attr[16] = "";
@ -31,15 +31,15 @@ void ConsoleListener::Log(Common::Log::LOG_LEVELS level, const char* text)
strcpy(reset_attr, "\x1b[0m");
switch (level)
{
case Common::Log::LOG_LEVELS::LNOTICE:
case Common::Log::LogLevel::LNOTICE:
// light green
strcpy(color_attr, "\x1b[92m");
break;
case Common::Log::LOG_LEVELS::LERROR:
case Common::Log::LogLevel::LERROR:
// light red
strcpy(color_attr, "\x1b[91m");
break;
case Common::Log::LOG_LEVELS::LWARNING:
case Common::Log::LogLevel::LWARNING:
// light yellow
strcpy(color_attr, "\x1b[93m");
break;

2
Source/Core/Common/Logging/ConsoleListenerWin.cpp
View File

@ -14,7 +14,7 @@ ConsoleListener::~ConsoleListener()
{
}
void ConsoleListener::Log([[maybe_unused]] Common::Log::LOG_LEVELS level, const char* text)
void ConsoleListener::Log([[maybe_unused]] Common::Log::LogLevel level, const char* text)
{
::OutputDebugStringW(UTF8ToWString(text).c_str());
}

34
Source/Core/Common/Logging/Log.h
View File

@ -10,7 +10,7 @@
namespace Common::Log
{
enum LOG_TYPE
enum class LogType : int
{
ACTIONREPLAY,
AUDIO,
@ -67,7 +67,7 @@ enum LOG_TYPE
NUMBER_OF_LOGS // Must be last
};
enum LOG_LEVELS
enum class LogLevel : int
{
LNOTICE = 1, // VERY important information that is NOT errors. Like startup and OSReports.
LERROR = 2, // Critical errors
@ -77,18 +77,18 @@ enum LOG_LEVELS
};
#if defined(_DEBUG) || defined(DEBUGFAST)
constexpr auto MAX_LOGLEVEL = Common::Log::LOG_LEVELS::LDEBUG;
constexpr auto MAX_LOGLEVEL = Common::Log::LogLevel::LDEBUG;
#else
constexpr auto MAX_LOGLEVEL = Common::Log::LOG_LEVELS::LINFO;
constexpr auto MAX_LOGLEVEL = Common::Log::LogLevel::LINFO;
#endif // logging
static const char LOG_LEVEL_TO_CHAR[7] = "-NEWID";
void GenericLogFmtImpl(LOG_LEVELS level, LOG_TYPE type, const char* file, int line,
void GenericLogFmtImpl(LogLevel level, LogType type, const char* file, int line,
fmt::string_view format, const fmt::format_args& args);
template <std::size_t NumFields, typename S, typename... Args>
void GenericLogFmt(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, const S& format,
void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, const S& format,
const Args&... args)
{
static_assert(NumFields == sizeof...(args),
@ -98,7 +98,7 @@ void GenericLogFmt(LOG_LEVELS level, LOG_TYPE type, const char* file, int line,
fmt::make_args_checked<Args...>(format, args...));
}
void GenericLog(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, const char* fmt, ...)
void GenericLog(LogLevel level, LogType type, const char* file, int line, const char* fmt, ...)
#ifdef __GNUC__
__attribute__((format(printf, 5, 6)))
#endif
@ -116,27 +116,27 @@ void GenericLog(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, con
#define ERROR_LOG(t, ...) \
do \
{ \
GENERIC_LOG(Common::Log::t, Common::Log::LERROR, __VA_ARGS__); \
GENERIC_LOG(Common::Log::LogType::t, Common::Log::LogLevel::LERROR, __VA_ARGS__); \
} while (0)
#define WARN_LOG(t, ...) \
do \
{ \
GENERIC_LOG(Common::Log::t, Common::Log::LWARNING, __VA_ARGS__); \
GENERIC_LOG(Common::Log::LogType::t, Common::Log::LogLevel::LWARNING, __VA_ARGS__); \
} while (0)
#define NOTICE_LOG(t, ...) \
do \
{ \
GENERIC_LOG(Common::Log::t, Common::Log::LNOTICE, __VA_ARGS__); \
GENERIC_LOG(Common::Log::LogType::t, Common::Log::LogLevel::LNOTICE, __VA_ARGS__); \
} while (0)
#define INFO_LOG(t, ...) \
do \
{ \
GENERIC_LOG(Common::Log::t, Common::Log::LINFO, __VA_ARGS__); \
GENERIC_LOG(Common::Log::LogType::t, Common::Log::LogLevel::LINFO, __VA_ARGS__); \
} while (0)
#define DEBUG_LOG(t, ...) \
do \
{ \
GENERIC_LOG(Common::Log::t, Common::Log::LDEBUG, __VA_ARGS__); \
GENERIC_LOG(Common::Log::LogType::t, Common::Log::LogLevel::LDEBUG, __VA_ARGS__); \
} while (0)
// fmtlib capable API
@ -156,25 +156,25 @@ void GenericLog(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, con
#define ERROR_LOG_FMT(t, ...) \
do \
{ \
GENERIC_LOG_FMT(Common::Log::t, Common::Log::LERROR, __VA_ARGS__); \
GENERIC_LOG_FMT(Common::Log::LogType::t, Common::Log::LogLevel::LERROR, __VA_ARGS__); \
} while (0)
#define WARN_LOG_FMT(t, ...) \
do \
{ \
GENERIC_LOG_FMT(Common::Log::t, Common::Log::LWARNING, __VA_ARGS__); \
GENERIC_LOG_FMT(Common::Log::LogType::t, Common::Log::LogLevel::LWARNING, __VA_ARGS__); \
} while (0)
#define NOTICE_LOG_FMT(t, ...) \
do \
{ \
GENERIC_LOG_FMT(Common::Log::t, Common::Log::LNOTICE, __VA_ARGS__); \
GENERIC_LOG_FMT(Common::Log::LogType::t, Common::Log::LogLevel::LNOTICE, __VA_ARGS__); \
} while (0)
#define INFO_LOG_FMT(t, ...) \
do \
{ \
GENERIC_LOG_FMT(Common::Log::t, Common::Log::LINFO, __VA_ARGS__); \
GENERIC_LOG_FMT(Common::Log::LogType::t, Common::Log::LogLevel::LINFO, __VA_ARGS__); \
} while (0)
#define DEBUG_LOG_FMT(t, ...) \
do \
{ \
GENERIC_LOG_FMT(Common::Log::t, Common::Log::LDEBUG, __VA_ARGS__); \
GENERIC_LOG_FMT(Common::Log::LogType::t, Common::Log::LogLevel::LDEBUG, __VA_ARGS__); \
} while (0)

149
Source/Core/Common/Logging/LogManager.cpp
View File

@ -31,7 +31,8 @@ const Config::Info<bool> LOGGER_WRITE_TO_CONSOLE{
{Config::System::Logger, "Options", "WriteToConsole"}, true};
const Config::Info<bool> LOGGER_WRITE_TO_WINDOW{
{Config::System::Logger, "Options", "WriteToWindow"}, true};
const Config::Info<int> LOGGER_VERBOSITY{{Config::System::Logger, "Options", "Verbosity"}, 0};
const Config::Info<LogLevel> LOGGER_VERBOSITY{{Config::System::Logger, "Options", "Verbosity"},
LogLevel::LNOTICE};
class FileLogListener : public LogListener
{
@ -42,7 +43,7 @@ public:
SetEnable(true);
}
void Log(LOG_LEVELS, const char* msg) override
void Log(LogLevel, const char* msg) override
{
if (!IsEnabled() || !IsValid())
return;
@ -61,7 +62,7 @@ private:
bool m_enable;
};
void GenericLog(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, const char* fmt, ...)
void GenericLog(LogLevel level, LogType type, const char* file, int line, const char* fmt, ...)
{
auto* instance = LogManager::GetInstance();
if (instance == nullptr)
@ -79,7 +80,7 @@ void GenericLog(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, con
instance->Log(level, type, file, line, message);
}
void GenericLogFmtImpl(LOG_LEVELS level, LOG_TYPE type, const char* file, int line,
void GenericLogFmtImpl(LogLevel level, LogType type, const char* file, int line,
fmt::string_view format, const fmt::format_args& args)
{
auto* instance = LogManager::GetInstance();
@ -115,79 +116,75 @@ static size_t DeterminePathCutOffPoint()
LogManager::LogManager()
{
// create log containers
m_log[ACTIONREPLAY] = {"ActionReplay", "Action Replay"};
m_log[AUDIO] = {"Audio", "Audio Emulator"};
m_log[AUDIO_INTERFACE] = {"AI", "Audio Interface"};
m_log[BOOT] = {"BOOT", "Boot"};
m_log[COMMANDPROCESSOR] = {"CP", "Command Processor"};
m_log[COMMON] = {"COMMON", "Common"};
m_log[CONSOLE] = {"CONSOLE", "Dolphin Console"};
m_log[CONTROLLERINTERFACE] = {"CI", "Controller Interface"};
m_log[CORE] = {"CORE", "Core"};
m_log[DISCIO] = {"DIO", "Disc IO"};
m_log[DSPHLE] = {"DSPHLE", "DSP HLE"};
m_log[DSPLLE] = {"DSPLLE", "DSP LLE"};
m_log[DSP_MAIL] = {"DSPMails", "DSP Mails"};
m_log[DSPINTERFACE] = {"DSP", "DSP Interface"};
m_log[DVDINTERFACE] = {"DVD", "DVD Interface"};
m_log[DYNA_REC] = {"JIT", "JIT Dynamic Recompiler"};
m_log[EXPANSIONINTERFACE] = {"EXI", "Expansion Interface"};
m_log[FILEMON] = {"FileMon", "File Monitor"};
m_log[FRAMEDUMP] = {"FRAMEDUMP", "FrameDump"};
m_log[GDB_STUB] = {"GDB_STUB", "GDB Stub"};
m_log[GPFIFO] = {"GP", "GatherPipe FIFO"};
m_log[HOST_GPU] = {"Host GPU", "Host GPU"};
m_log[IOS] = {"IOS", "IOS"};
m_log[IOS_DI] = {"IOS_DI", "IOS - Drive Interface"};
m_log[IOS_ES] = {"IOS_ES", "IOS - ETicket Services"};
m_log[IOS_FS] = {"IOS_FS", "IOS - Filesystem Services"};
m_log[IOS_SD] = {"IOS_SD", "IOS - SDIO"};
m_log[IOS_SSL] = {"IOS_SSL", "IOS - SSL"};
m_log[IOS_STM] = {"IOS_STM", "IOS - State Transition Manager"};
m_log[IOS_NET] = {"IOS_NET", "IOS - Network"};
m_log[IOS_USB] = {"IOS_USB", "IOS - USB"};
m_log[IOS_WC24] = {"IOS_WC24", "IOS - WiiConnect24"};
m_log[IOS_WFS] = {"IOS_WFS", "IOS - WFS"};
m_log[IOS_WIIMOTE] = {"IOS_WIIMOTE", "IOS - Wii Remote"};
m_log[MASTER_LOG] = {"MASTER", "Master Log"};
m_log[MEMCARD_MANAGER] = {"MemCard Manager", "Memory Card Manager"};
m_log[MEMMAP] = {"MI", "Memory Interface & Memory Map"};
m_log[NETPLAY] = {"NETPLAY", "Netplay"};
m_log[OSHLE] = {"HLE", "OSHLE"};
m_log[OSREPORT] = {"OSREPORT", "OSReport EXI"};
m_log[OSREPORT_HLE] = {"OSREPORT_HLE", "OSReport HLE"};
m_log[PIXELENGINE] = {"PE", "Pixel Engine"};
m_log[PROCESSORINTERFACE] = {"PI", "Processor Interface"};
m_log[POWERPC] = {"PowerPC", "PowerPC IBM CPU"};
m_log[SERIALINTERFACE] = {"SI", "Serial Interface"};
m_log[SP1] = {"SP1", "Serial Port 1"};
m_log[SYMBOLS] = {"SYMBOLS", "Symbols"};
m_log[VIDEO] = {"Video", "Video Backend"};
m_log[VIDEOINTERFACE] = {"VI", "Video Interface"};
m_log[WIIMOTE] = {"Wiimote", "Wii Remote"};
m_log[WII_IPC] = {"WII_IPC", "WII IPC"};
m_log[LogType::ACTIONREPLAY] = {"ActionReplay", "Action Replay"};
m_log[LogType::AUDIO] = {"Audio", "Audio Emulator"};
m_log[LogType::AUDIO_INTERFACE] = {"AI", "Audio Interface"};
m_log[LogType::BOOT] = {"BOOT", "Boot"};
m_log[LogType::COMMANDPROCESSOR] = {"CP", "Command Processor"};
m_log[LogType::COMMON] = {"COMMON", "Common"};
m_log[LogType::CONSOLE] = {"CONSOLE", "Dolphin Console"};
m_log[LogType::CONTROLLERINTERFACE] = {"CI", "Controller Interface"};
m_log[LogType::CORE] = {"CORE", "Core"};
m_log[LogType::DISCIO] = {"DIO", "Disc IO"};
m_log[LogType::DSPHLE] = {"DSPHLE", "DSP HLE"};
m_log[LogType::DSPLLE] = {"DSPLLE", "DSP LLE"};
m_log[LogType::DSP_MAIL] = {"DSPMails", "DSP Mails"};
m_log[LogType::DSPINTERFACE] = {"DSP", "DSP Interface"};
m_log[LogType::DVDINTERFACE] = {"DVD", "DVD Interface"};
m_log[LogType::DYNA_REC] = {"JIT", "JIT Dynamic Recompiler"};
m_log[LogType::EXPANSIONINTERFACE] = {"EXI", "Expansion Interface"};
m_log[LogType::FILEMON] = {"FileMon", "File Monitor"};
m_log[LogType::FRAMEDUMP] = {"FRAMEDUMP", "FrameDump"};
m_log[LogType::GDB_STUB] = {"GDB_STUB", "GDB Stub"};
m_log[LogType::GPFIFO] = {"GP", "GatherPipe FIFO"};
m_log[LogType::HOST_GPU] = {"Host GPU", "Host GPU"};
m_log[LogType::IOS] = {"IOS", "IOS"};
m_log[LogType::IOS_DI] = {"IOS_DI", "IOS - Drive Interface"};
m_log[LogType::IOS_ES] = {"IOS_ES", "IOS - ETicket Services"};
m_log[LogType::IOS_FS] = {"IOS_FS", "IOS - Filesystem Services"};
m_log[LogType::IOS_SD] = {"IOS_SD", "IOS - SDIO"};
m_log[LogType::IOS_SSL] = {"IOS_SSL", "IOS - SSL"};
m_log[LogType::IOS_STM] = {"IOS_STM", "IOS - State Transition Manager"};
m_log[LogType::IOS_NET] = {"IOS_NET", "IOS - Network"};
m_log[LogType::IOS_USB] = {"IOS_USB", "IOS - USB"};
m_log[LogType::IOS_WC24] = {"IOS_WC24", "IOS - WiiConnect24"};
m_log[LogType::IOS_WFS] = {"IOS_WFS", "IOS - WFS"};
m_log[LogType::IOS_WIIMOTE] = {"IOS_WIIMOTE", "IOS - Wii Remote"};
m_log[LogType::MASTER_LOG] = {"MASTER", "Master Log"};
m_log[LogType::MEMCARD_MANAGER] = {"MemCard Manager", "Memory Card Manager"};
m_log[LogType::MEMMAP] = {"MI", "Memory Interface & Memory Map"};
m_log[LogType::NETPLAY] = {"NETPLAY", "Netplay"};
m_log[LogType::OSHLE] = {"HLE", "OSHLE"};
m_log[LogType::OSREPORT] = {"OSREPORT", "OSReport EXI"};
m_log[LogType::OSREPORT_HLE] = {"OSREPORT_HLE", "OSReport HLE"};
m_log[LogType::PIXELENGINE] = {"PE", "Pixel Engine"};
m_log[LogType::PROCESSORINTERFACE] = {"PI", "Processor Interface"};
m_log[LogType::POWERPC] = {"PowerPC", "PowerPC IBM CPU"};
m_log[LogType::SERIALINTERFACE] = {"SI", "Serial Interface"};
m_log[LogType::SP1] = {"SP1", "Serial Port 1"};
m_log[LogType::SYMBOLS] = {"SYMBOLS", "Symbols"};
m_log[LogType::VIDEO] = {"Video", "Video Backend"};
m_log[LogType::VIDEOINTERFACE] = {"VI", "Video Interface"};
m_log[LogType::WIIMOTE] = {"Wiimote", "Wii Remote"};
m_log[LogType::WII_IPC] = {"WII_IPC", "WII IPC"};
RegisterListener(LogListener::FILE_LISTENER,
new FileLogListener(File::GetUserPath(F_MAINLOG_IDX)));
RegisterListener(LogListener::CONSOLE_LISTENER, new ConsoleListener());
// Set up log listeners
int verbosity = Config::Get(LOGGER_VERBOSITY);
LogLevel verbosity = Config::Get(LOGGER_VERBOSITY);
// Ensure the verbosity level is valid
if (verbosity < 1)
verbosity = 1;
if (verbosity > MAX_LOGLEVEL)
verbosity = MAX_LOGLEVEL;
SetLogLevel(static_cast<LOG_LEVELS>(verbosity));
SetLogLevel(verbosity);
EnableListener(LogListener::FILE_LISTENER, Config::Get(LOGGER_WRITE_TO_FILE));
EnableListener(LogListener::CONSOLE_LISTENER, Config::Get(LOGGER_WRITE_TO_CONSOLE));
EnableListener(LogListener::LOG_WINDOW_LISTENER, Config::Get(LOGGER_WRITE_TO_WINDOW));
for (LogContainer& container : m_log)
for (auto& container : m_log)
{
container.m_enable = Config::Get(
Config::Info<bool>{{Config::System::Logger, "Logs", container.m_short_name}, false});
}
m_path_cutoff_point = DeterminePathCutOffPoint();
}
@ -208,7 +205,7 @@ void LogManager::SaveSettings()
IsListenerEnabled(LogListener::CONSOLE_LISTENER));
Config::SetBaseOrCurrent(LOGGER_WRITE_TO_WINDOW,
IsListenerEnabled(LogListener::LOG_WINDOW_LISTENER));
Config::SetBaseOrCurrent(LOGGER_VERBOSITY, static_cast<int>(GetLogLevel()));
Config::SetBaseOrCurrent(LOGGER_VERBOSITY, GetLogLevel());
for (const auto& container : m_log)
{
@ -219,8 +216,7 @@ void LogManager::SaveSettings()
Config::Save();
}
void LogManager::Log(LOG_LEVELS level, LOG_TYPE type, const char* file, int line,
const char* message)
void LogManager::Log(LogLevel level, LogType type, const char* file, int line, const char* message)
{
if (!IsEnabled(type, level) || !static_cast<bool>(m_listener_ids))
return;
@ -228,7 +224,7 @@ void LogManager::Log(LOG_LEVELS level, LOG_TYPE type, const char* file, int line
LogWithFullPath(level, type, file + m_path_cutoff_point, line, message);
}
void LogManager::LogWithFullPath(LOG_LEVELS level, LOG_TYPE type, const char* file, int line,
void LogManager::LogWithFullPath(LogLevel level, LogType type, const char* file, int line,
const char* message)
{
const std::string msg =
@ -242,22 +238,22 @@ void LogManager::LogWithFullPath(LOG_LEVELS level, LOG_TYPE type, const char* fi
}
}
LOG_LEVELS LogManager::GetLogLevel() const
LogLevel LogManager::GetLogLevel() const
{
return m_level;
}
void LogManager::SetLogLevel(LOG_LEVELS level)
void LogManager::SetLogLevel(LogLevel level)
{
m_level = level;
m_level = std::clamp(level, LogLevel::LNOTICE, MAX_LOGLEVEL);
}
void LogManager::SetEnable(LOG_TYPE type, bool enable)
void LogManager::SetEnable(LogType type, bool enable)
{
m_log[type].m_enable = enable;
}
bool LogManager::IsEnabled(LOG_TYPE type, LOG_LEVELS level) const
bool LogManager::IsEnabled(LogType type, LogLevel level) const
{
return m_log[type].m_enable && GetLogLevel() >= level;
}
@ -267,18 +263,17 @@ std::map<std::string, std::string> LogManager::GetLogTypes()
std::map<std::string, std::string> log_types;
for (const auto& container : m_log)
{
log_types.emplace(container.m_short_name, container.m_full_name);
}
return log_types;
}
const char* LogManager::GetShortName(LOG_TYPE type) const
const char* LogManager::GetShortName(LogType type) const
{
return m_log[type].m_short_name;
}
const char* LogManager::GetFullName(LOG_TYPE type) const
const char* LogManager::GetFullName(LogType type) const
{
return m_log[type].m_full_name;
}

23
Source/Core/Common/Logging/LogManager.h
View File

@ -9,6 +9,7 @@
#include <string>
#include "Common/BitSet.h"
#include "Common/EnumMap.h"
#include "Common/Logging/Log.h"
namespace Common::Log
@ -18,7 +19,7 @@ class LogListener
{
public:
virtual ~LogListener() = default;
virtual void Log(LOG_LEVELS level, const char* msg) = 0;
virtual void Log(LogLevel level, const char* msg) = 0;
enum LISTENER
{
@ -37,18 +38,18 @@ public:
static void Init();
static void Shutdown();
void Log(LOG_LEVELS level, LOG_TYPE type, const char* file, int line, const char* message);
void Log(LogLevel level, LogType type, const char* file, int line, const char* message);
LOG_LEVELS GetLogLevel() const;
void SetLogLevel(LOG_LEVELS level);
LogLevel GetLogLevel() const;
void SetLogLevel(LogLevel level);
void SetEnable(LOG_TYPE type, bool enable);
bool IsEnabled(LOG_TYPE type, LOG_LEVELS level = LNOTICE) const;
void SetEnable(LogType type, bool enable);
bool IsEnabled(LogType type, LogLevel level = LogLevel::LNOTICE) const;
std::map<std::string, std::string> GetLogTypes();
const char* GetShortName(LOG_TYPE type) const;
const char* GetFullName(LOG_TYPE type) const;
const char* GetShortName(LogType type) const;
const char* GetFullName(LogType type) const;
void RegisterListener(LogListener::LISTENER id, LogListener* listener);
void EnableListener(LogListener::LISTENER id, bool enable);
@ -72,11 +73,11 @@ private:
LogManager(LogManager&&) = delete;
LogManager& operator=(LogManager&&) = delete;
void LogWithFullPath(LOG_LEVELS level, LOG_TYPE type, const char* file, int line,
void LogWithFullPath(LogLevel level, LogType type, const char* file, int line,
const char* message);
LOG_LEVELS m_level;
std::array<LogContainer, NUMBER_OF_LOGS> m_log{};
LogLevel m_level;
EnumMap<LogContainer, LogType::WIIMOTE> m_log{};
std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners{};
BitSet32 m_listener_ids;
size_t m_path_cutoff_point = 0;