scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 20:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debug: use the rang library for color output

Browse Source
This commit is contained in:
Martin Pulec
2018-09-19 10:26:20 +02:00
parent 28699bac9c
commit 921d094444
3 changed files with 14 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/debug.cpp
View File

@@ -48,11 +48,7 @@
#include "debug.h"
#include "host.h"
#include <mutex>
#ifdef WIN32
#include <wincon.h>
#endif
#include "rang.hpp"
static void _dprintf(const char *format, ...)
{
@@ -79,9 +75,7 @@ static void _dprintf(const char *format, ...)
void log_msg(int level, const char *format, ...)
{
static std::mutex log_lock;
va_list ap;
const char *color_nix = NULL;
if (log_level < level) {
return;
@@ -100,87 +94,40 @@ void log_msg(int level, const char *format, ...)
}
#endif /* WIN32 */
#ifdef WIN32
HANDLE con;
bool no_color = true;
CONSOLE_SCREEN_BUFFER_INFO con_info;
uint32_t color_win = 0u;
rang::fg color = rang::fg::reset;
rang::style style = rang::style::reset;
switch (level) {
case LOG_LEVEL_FATAL: color_win = FOREGROUND_RED | FOREGROUND_INTENSITY; break;
case LOG_LEVEL_ERROR: color_win = FOREGROUND_RED; break;
case LOG_LEVEL_WARNING: color_win = FOREGROUND_RED | FOREGROUND_GREEN; break;
case LOG_LEVEL_NOTICE: color_win = FOREGROUND_GREEN; break;
case LOG_LEVEL_FATAL: color = rang::fg::red; style = rang::style::bold; break;
case LOG_LEVEL_ERROR: color = rang::fg::red; break;
case LOG_LEVEL_WARNING: color = rang::fg::yellow; break;
case LOG_LEVEL_NOTICE: color = rang::fg::green; break;
}
#else
switch (level) {
case LOG_LEVEL_FATAL: color_nix = "\033[1;31m"; break;
case LOG_LEVEL_ERROR: color_nix = "\033[0;31m"; break;
case LOG_LEVEL_WARNING: color_nix = "\033[0;33m"; break;
case LOG_LEVEL_NOTICE: color_nix = "\033[0;32m"; break;
}
#endif
// format new format string
char *format_new = (char *) alloca(strlen(format) + 7 /* col start */ + 4 /* col end */ +
(3 + 20 /* 64b int dec */ + 1 /* dot */ + 3 /* ms */) /* time */ + 1);
format_new[0] = '\0';
if (color_nix_term && color_nix) {
strcat(format_new, color_nix);
}
auto timestamp = (char *) alloca((3 /* "[] " */ + 20 /* 64b int dec */ + 1 /* dot */ + 3 /* ms */) /* time */ + 1);
timestamp[0] = '\0';
if (log_level >= LOG_LEVEL_VERBOSE) {
unsigned long long time_ms = time_since_epoch_in_ms();
sprintf(format_new + strlen(format_new), "[%llu.%03llu] ", time_ms / 1000,
sprintf(timestamp, "[%llu.%03llu] ", time_ms / 1000,
time_ms % 1000);
}
strcat(format_new, format);
if (color_nix_term && color_nix) {
strcat(format_new, "\033[0m");
}
// get number of required bytes
va_start(ap, format);
int size = vsnprintf(NULL, 0, format_new, ap);
int size = vsnprintf(NULL, 0, format, ap);
va_end(ap);
// format the string
char *buffer = (char *) alloca(size + 1);
va_start(ap, format);
if (vsprintf(buffer, format_new, ap) != size) {
if (vsprintf(buffer, format, ap) != size) {
va_end(ap);
return;
}
va_end(ap);
// print it
log_lock.lock();
#ifdef WIN32
if (color_win != 0u) {
con = GetStdHandle(STD_ERROR_HANDLE);
no_color = con == INVALID_HANDLE_VALUE || getenv("NO_COLOR")
|| (getenv("TERM") && strcmp(getenv("TERM"), "xterm") == 0); // MSYS2 pseudoterminal
if (!no_color) {
GetConsoleScreenBufferInfo(con, &con_info);
SetConsoleTextAttribute(con, ((con_info.wAttributes) & 0xF0) | color_win);
}
}
#endif
int written = 0;
do {
ssize_t ret = write(STDERR_FILENO, buffer + written, size - written);
if (ret <= 0) {
break;
} else {
written += ret;
}
} while (written < size);
#ifdef WIN32
if (!no_color) {
SetConsoleTextAttribute(con, con_info.wAttributes);
}
#endif
log_lock.unlock();
std::cerr << style << color << timestamp <<
buffer << rang::style::reset << rang::fg::reset;
}
/**