Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common/Log: Fix compilation on Android

Browse source
This commit is contained in:
Connor McLaughlin 2021-07-30 17:01:07 +10:00
parent b948bb0750
commit 642f8041e9
1 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/common/log.cpp
View file

@ -32,7 +32,7 @@ static LOGLEVEL s_filter_level = LOGLEVEL_TRACE;
static Common::Timer::Value s_startTimeStamp = Common::Timer::GetValue(); static Common::Timer::Value s_startTimeStamp = Common::Timer::GetValue();
static bool s_consoleOutputEnabled = false; static bool s_console_output_enabled = false;
static String s_console_output_channel_filter; static String s_console_output_channel_filter;
static LOGLEVEL s_console_output_level_filter = LOGLEVEL_TRACE; static LOGLEVEL s_console_output_level_filter = LOGLEVEL_TRACE;
@ -83,7 +83,7 @@ void UnregisterCallback(CallbackFunctionType callbackFunction, void* pUserParam)
bool IsConsoleOutputEnabled() bool IsConsoleOutputEnabled()
{ {
return s_consoleOutputEnabled; return s_console_output_enabled;
} }
bool IsDebugOutputEnabled() bool IsDebugOutputEnabled()
@ -160,7 +160,8 @@ static ALWAYS_INLINE void FormatLogMessageAndPrint(const char* channelName, cons
char* message_buf = buf; char* message_buf = buf;
int message_len; int message_len;
if ((message_len = FormatLogMessageForDisplay(message_buf, sizeof(buf), channelName, functionName, level, message, if ((message_len = FormatLogMessageForDisplay(message_buf, sizeof(buf), channelName, functionName, level, message,
timestamp, ansi_color_code, newline)) > (sizeof(buf) - 1)) timestamp, ansi_color_code, newline)) >
static_cast<int>(sizeof(buf) - 1))
{ {
message_buf = static_cast<char*>(std::malloc(message_len + 1)); message_buf = static_cast<char*>(std::malloc(message_len + 1));
message_len = FormatLogMessageForDisplay(message_buf, message_len + 1, channelName, functionName, level, message, message_len = FormatLogMessageForDisplay(message_buf, message_len + 1, channelName, functionName, level, message,
@ -176,9 +177,9 @@ static ALWAYS_INLINE void FormatLogMessageAndPrint(const char* channelName, cons
#ifdef _WIN32 #ifdef _WIN32
template<typename T> template<typename T>
static /*ALWAYS_INLINE*/ void FormatLogMessageAndPrintW(const char* channelName, const char* functionName, static ALWAYS_INLINE void FormatLogMessageAndPrintW(const char* channelName, const char* functionName, LOGLEVEL level,
LOGLEVEL level, const char* message, bool timestamp, const char* message, bool timestamp, bool ansi_color_code,
bool ansi_color_code, bool newline, const T& callback) bool newline, const T& callback)
{ {
char buf[512]; char buf[512];
char* message_buf = buf; char* message_buf = buf;
@ -236,7 +237,7 @@ static bool EnableVirtualTerminalProcessing(HANDLE hConsole)
static void ConsoleOutputLogCallback(void* pUserParam, const char* channelName, const char* functionName, static void ConsoleOutputLogCallback(void* pUserParam, const char* channelName, const char* functionName,
LOGLEVEL level, const char* message) LOGLEVEL level, const char* message)
{ {
if (!s_consoleOutputEnabled || level > s_console_output_level_filter || if (!s_console_output_enabled || level > s_console_output_level_filter ||
s_console_output_channel_filter.Find(channelName) >= 0) s_console_output_channel_filter.Find(channelName) >= 0)
{ {
return; return;
@ -285,7 +286,6 @@ static void DebugOutputLogCallback(void* pUserParam, const char* channelName, co
}; };
__android_log_write(logPriority[level], channelName, message); __android_log_write(logPriority[level], channelName, message);
}
#else #else
#endif #endif
} }
@ -295,10 +295,10 @@ void SetConsoleOutputParams(bool Enabled, const char* ChannelFilter, LOGLEVEL Le
s_console_output_channel_filter = (ChannelFilter != NULL) ? ChannelFilter : ""; s_console_output_channel_filter = (ChannelFilter != NULL) ? ChannelFilter : "";
s_console_output_level_filter = LevelFilter; s_console_output_level_filter = LevelFilter;
if (s_consoleOutputEnabled == Enabled) if (s_console_output_enabled == Enabled)
return; return;
s_consoleOutputEnabled = Enabled; s_console_output_enabled = Enabled;
#if defined(_WIN32) #if defined(_WIN32)
// On windows, no console is allocated by default on a windows based application // On windows, no console is allocated by default on a windows based application
@ -339,13 +339,9 @@ void SetConsoleOutputParams(bool Enabled, const char* ChannelFilter, LOGLEVEL Le
s_hConsoleStdOut = old_stdout; s_hConsoleStdOut = old_stdout;
s_hConsoleStdErr = old_stderr; s_hConsoleStdErr = old_stderr;
} }
RegisterCallback(ConsoleOutputLogCallback, NULL);
} }
else else
{ {
UnregisterCallback(ConsoleOutputLogCallback, NULL);
if (console_was_allocated) if (console_was_allocated)
{ {
console_was_allocated = false; console_was_allocated = false;
@ -367,6 +363,11 @@ void SetConsoleOutputParams(bool Enabled, const char* ChannelFilter, LOGLEVEL Le
} }
} }
#endif #endif
if (Enabled)
RegisterCallback(ConsoleOutputLogCallback, nullptr);
else
UnregisterCallback(ConsoleOutputLogCallback, nullptr);
} }
void SetDebugOutputParams(bool enabled, const char* channelFilter /* = nullptr */, void SetDebugOutputParams(bool enabled, const char* channelFilter /* = nullptr */,
@ -391,21 +392,9 @@ static void FileOutputLogCallback(void* pUserParam, const char* channelName, con
if (level > s_file_output_level_filter || s_file_output_channel_filter.Find(channelName) >= 0) if (level > s_file_output_level_filter || s_file_output_channel_filter.Find(channelName) >= 0)
return; return;
char buf[512]; FormatLogMessageAndPrint(
char* message_buf = buf; channelName, functionName, level, message, true, false, true,
int message_len; [](const char* message, int message_len) { std::fwrite(message, 1, message_len, s_fileOutputHandle.get()); });
if ((message_len = FormatLogMessageForDisplay(message_buf, sizeof(buf), channelName, functionName, level, message,
s_file_output_timestamp, false, true)) > (sizeof(buf) - 1))
{
message_buf = static_cast<char*>(std::malloc(message_len + 1));
message_len = FormatLogMessageForDisplay(message_buf, message_len + 1, channelName, functionName, level, message,
s_file_output_timestamp, false, true);
}
std::fwrite(message_buf, 1, message_len, s_fileOutputHandle.get());
if (message_buf != buf)
std::free(message_buf);
} }
void SetFileOutputParams(bool enabled, const char* filename, bool timestamps /* = true */, void SetFileOutputParams(bool enabled, const char* filename, bool timestamps /* = true */,