dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: replace seprintf with fmt::format for filling the crash log data

Browse Source
This commit is contained in:
Rubidium
2023-05-20 19:45:38 +02:00
committed by rubidium42
parent f4b0ac2bd4
commit 19304bd3d5
5 changed files with 234 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/os/unix/crashlog_unix.cpp
View File

@@ -38,19 +38,20 @@ class CrashLogUnix : public CrashLog {
/** Signal that has been thrown. */
int signum;
char *LogOSVersion(char *buffer, const char *last) const override
void LogOSVersion(std::back_insert_iterator<std::string> &output_iterator) const override
{
struct utsname name;
if (uname(&name) < 0) {
return buffer + seprintf(buffer, last, "Could not get OS version: %s\n", strerror(errno));
fmt::format_to(output_iterator, "Could not get OS version: {}\n", strerror(errno));
return;
}
return buffer + seprintf(buffer, last,
fmt::format_to(output_iterator,
"Operating system:\n"
" Name: %s\n"
" Release: %s\n"
" Version: %s\n"
" Machine: %s\n",
" Name: {}\n"
" Release: {}\n"
" Version: {}\n"
" Machine: {}\n",
name.sysname,
name.release,
name.version,
@@ -58,12 +59,12 @@ class CrashLogUnix : public CrashLog {
);
}
char *LogError(char *buffer, const char *last, const char *message) const override
void LogError(std::back_insert_iterator<std::string> &output_iterator, const std::string_view message) const override
{
return buffer + seprintf(buffer, last,
"Crash reason:\n"
" Signal: %s (%d)\n"
" Message: %s\n\n",
fmt::format_to(output_iterator,
"Crash reason:\n"
" Signal: {} ({})\n"
" Message: {}\n\n",
strsignal(this->signum),
this->signum,
message
@@ -73,9 +74,8 @@ class CrashLogUnix : public CrashLog {
#if defined(SUNOS)
/** Data needed while walking up the stack */
struct StackWalkerParams {
char **bufptr; ///< Buffer
const char *last; ///< End of buffer
int counter; ///< We are at counter-th stack level
std::back_insert_iterator<std::string> *output_iterator; ///< Buffer
int counter; ///< We are at counter-th stack level
};
/**
@@ -92,10 +92,10 @@ class CrashLogUnix : public CrashLog {
/* Resolve program counter to file and nearest symbol (if possible) */
Dl_info dli;
if (dladdr((void *)pc, &dli) != 0) {
*wp->bufptr += seprintf(*wp->bufptr, wp->last, " [%02i] %s(%s+0x%x) [0x%x]\n",
fmt::format_to(*wp->output_iterator, " [{:02}] {}({}+0x{:x}) [0x{:x}]\n",
wp->counter, dli.dli_fname, dli.dli_sname, (int)((byte *)pc - (byte *)dli.dli_saddr), (uint)pc);
} else {
*wp->bufptr += seprintf(*wp->bufptr, wp->last, " [%02i] [0x%x]\n", wp->counter, (uint)pc);
fmt::format_to(*wp->output_iterator, " [{:02}] [0x{:x}]\n", wp->counter, (uint)pc);
}
wp->counter++;
@@ -103,31 +103,31 @@ class CrashLogUnix : public CrashLog {
}
#endif
char *LogStacktrace(char *buffer, const char *last) const override
void LogStacktrace(std::back_insert_iterator<std::string> &output_iterator) const override
{
buffer += seprintf(buffer, last, "Stacktrace:\n");
fmt::format_to(output_iterator, "Stacktrace:\n");
#if defined(__GLIBC__)
void *trace[64];
int trace_size = backtrace(trace, lengthof(trace));
char **messages = backtrace_symbols(trace, trace_size);
for (int i = 0; i < trace_size; i++) {
buffer += seprintf(buffer, last, " [%02i] %s\n", i, messages[i]);
fmt::format_to(output_iterator, " [{:02}] {}\n", i, messages[i]);
}
free(messages);
#elif defined(SUNOS)
ucontext_t uc;
if (getcontext(&uc) != 0) {
buffer += seprintf(buffer, last, " getcontext() failed\n\n");
fmt::format_to(output_iterator, " getcontext() failed\n\n");
return buffer;
}
StackWalkerParams wp = { &buffer, last, 0 };
StackWalkerParams wp = { &output_iterator, 0 };
walkcontext(&uc, &CrashLogUnix::SunOSStackWalker, &wp);
#else
buffer += seprintf(buffer, last, " Not supported.\n");
fmt::format_to(output_iterator, " Not supported.\n");
#endif
return buffer + seprintf(buffer, last, "\n");
fmt::format_to(output_iterator, "\n");
}
public:
/**