Skip to content

add ellipsis to trucated log lines #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flipflip8952 merged 1 commit into from
Jan 5, 2026
Merged

add ellipsis to trucated log lines #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions fpsdk_common/src/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace logging {

static LoggingParams g_params;
std::mutex g_mutex;
static char g_line[0x1fff];
static char g_line[0x1fff]; // 8 KiB
static struct timespec g_time0 = { 0, 0 };

// ---------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -281,16 +281,27 @@ void LoggingPrint(const LoggingLevel level, const std::size_t repeat, const char
}
std::unique_lock<std::mutex> lock(g_mutex);

// Render log line
va_list args;
va_start(args, fmt);
int len = std::vsnprintf(g_line, sizeof(g_line), fmt, args);
std::size_t len = std::vsnprintf(g_line, sizeof(g_line), fmt, args);
va_end(args);

constexpr std::size_t repeat_str_len = 20;
constexpr std::size_t trunc_str_len = 15;

// Ellipsis (line is longer than buffer size)
if (len > (sizeof(g_line) - trunc_str_len - repeat_str_len)) {
len = sizeof(g_line) - trunc_str_len - repeat_str_len;
len += std::snprintf(&g_line[len], sizeof(g_line) - len, "...<truncated>");
}

// Append repeat (truncate if there's no space left)
if (repeat > 0) {
if (len > (int)(sizeof(g_line) - 10)) {
len -= 10;
if (len > (sizeof(g_line) - repeat_str_len)) {
len = sizeof(g_line) - repeat_str_len;
}
std::snprintf(&g_line[len], sizeof(g_line) - len, " [%" PRIuMAX "x]", repeat);
len += std::snprintf(&g_line[len], sizeof(g_line) - len, " [%" PRIuMAX "x]", repeat);
}

g_params.fn_(g_params, level, g_line);
Expand Down
Loading