Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-02 13:22:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[all] debug: add multiline debug print variants

Browse Source
This commit is contained in:
Geoffrey McRae
2026-07-29 10:27:14 +10:00
parent 61f00ae625
commit ea7924af43
4 changed files with 189 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
idd/LGCommon/CDebug.cpp
View File

@@ -161,13 +161,18 @@ void CDebug::Init(const wchar_t * name)
m_stream = std::move(stream);
}
void CDebug::LogStr(CDebug::Level level, const char *function, int line, bool wide, const void *str)
void CDebug::LogStr(CDebug::Level level, const char *function, int line, bool wide, const void *str,
const wchar_t *timestamp)
{
if (level < 0 || level >= LEVEL_MAX)
level = LEVEL_NONE;
wchar_t timestamp[50];
iso8601(timestamp, ARRAYSIZE(timestamp));
wchar_t currentTimestamp[50];
if (!timestamp)
{
iso8601(currentTimestamp, ARRAYSIZE(currentTimestamp));
timestamp = currentTimestamp;
}
wchar_t *result;
if (aswprintf(&result, wide ? L"[%s] [%S] %40S:%-4d | %s\n" : L"[%s] [%S] %40S:%-4d | %S\n",
@@ -202,6 +207,47 @@ void CDebug::Log(CDebug::Level level, const char *function, int line, const char
va_end(args);
}
void CDebug::LogML_va(CDebug::Level level, const char *function, int line, const char *fmt, va_list args)
{
char *result;
if (vasprintf(&result, fmt, args) < 0)
{
Write(L"Out of memory while logging");
return;
}
wchar_t timestamp[50];
iso8601(timestamp, ARRAYSIZE(timestamp));
char *start = result;
while (true)
{
char *end = strchr(start, '\n');
if (end)
*end = '\0';
size_t length = strlen(start);
if (length && start[length - 1] == '\r')
start[length - 1] = '\0';
LogStr(level, function, line, false, start, timestamp);
if (!end || !end[1])
break;
start = end + 1;
}
free(result);
}
void CDebug::LogML(CDebug::Level level, const char *function, int line, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
LogML_va(level, function, line, fmt, args);
va_end(args);
}
void CDebug::Log_va(CDebug::Level level, const char *function, int line, const wchar_t *fmt, va_list args)
{
wchar_t *result;
@@ -223,6 +269,47 @@ void CDebug::Log(CDebug::Level level, const char *function, int line, const wcha
va_end(args);
}
void CDebug::LogML_va(CDebug::Level level, const char *function, int line, const wchar_t *fmt, va_list args)
{
wchar_t *result;
if (vaswprintf(&result, fmt, args) < 0)
{
Write(L"Out of memory while logging");
return;
}
wchar_t timestamp[50];
iso8601(timestamp, ARRAYSIZE(timestamp));
wchar_t *start = result;
while (true)
{
wchar_t *end = wcschr(start, L'\n');
if (end)
*end = L'\0';
size_t length = wcslen(start);
if (length && start[length - 1] == L'\r')
start[length - 1] = L'\0';
LogStr(level, function, line, true, start, timestamp);
if (!end || !end[1])
break;
start = end + 1;
}
free(result);
}
void CDebug::LogML(CDebug::Level level, const char *function, int line, const wchar_t *fmt, ...)
{
va_list args;
va_start(args, fmt);
LogML_va(level, function, line, fmt, args);
va_end(args);
}
void CDebug::LogStrHR(CDebug::Level level, HRESULT hr, const char *function, int line, bool wide, const void *str)
{
wchar_t *hrBuffer;

13
idd/LGCommon/CDebug.h
View File

@@ -51,11 +51,16 @@ class CDebug
void Log(CDebug::Level level, const char *function, int line, const wchar_t *fmt, ...);
void Log_va(CDebug::Level level, const char *function, int line, const char *fmt, va_list args);
void Log(CDebug::Level level, const char *function, int line, const char *fmt, ...);
void LogML_va(CDebug::Level level, const char *function, int line, const wchar_t *fmt, va_list args);
void LogML(CDebug::Level level, const char *function, int line, const wchar_t *fmt, ...);
void LogML_va(CDebug::Level level, const char *function, int line, const char *fmt, va_list args);
void LogML(CDebug::Level level, const char *function, int line, const char *fmt, ...);
void LogHR(CDebug::Level level, HRESULT hr, const char *function, int line, const char *fmt, ...);
void LogHR(CDebug::Level level, HRESULT hr, const char *function, int line, const wchar_t *fmt, ...);
private:
void LogStr(CDebug::Level level, const char *function, int line, bool wide, const void *str);
void LogStr(CDebug::Level level, const char *function, int line, bool wide, const void *str,
const wchar_t *timestamp = nullptr);
void LogStrHR(CDebug::Level level, HRESULT hr, const char *function, int line, bool wide, const void *str);
static const char *s_levelStr[LEVEL_MAX];
};
@@ -69,6 +74,12 @@ extern CDebug g_debug;
#define DEBUG_FIXME(fmt, ...) g_debug.Log(CDebug::LEVEL_FIXME, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_FATAL(fmt, ...) g_debug.Log(CDebug::LEVEL_FATAL, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_INFO_ML(fmt, ...) g_debug.LogML(CDebug::LEVEL_INFO, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_WARN_ML(fmt, ...) g_debug.LogML(CDebug::LEVEL_WARN, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_ERROR_ML(fmt, ...) g_debug.LogML(CDebug::LEVEL_ERROR, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_TRACE_ML(fmt, ...) g_debug.LogML(CDebug::LEVEL_TRACE, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_FIXME_ML(fmt, ...) g_debug.LogML(CDebug::LEVEL_FIXME, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_FATAL_ML(fmt, ...) g_debug.LogML(CDebug::LEVEL_FATAL, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_INFO_HR(hr, fmt, ...) g_debug.LogHR(CDebug::LEVEL_INFO, hr, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define DEBUG_WARN_HR(hr, fmt, ...) g_debug.LogHR(CDebug::LEVEL_WARN, hr, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)