noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[Linux] Improve crash trace symbols

Browse Source 
Uses `addr2line` to also demangle symbols when available.
This commit is contained in:
A Thousand Ships
2026-03-04 13:21:20 +01:00
parent 0b3dc97fba
commit 8fe002819e
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/linuxbsd/crash_handler_linuxbsd.cpp
+27 -20
View File
@@ -141,39 +141,46 @@ static void handle_crash(int sig) {
}
args.push_back("-e");
args.push_back(_execpath);
args.push_back("-f");
args.push_back("-p");
args.push_back("-C");
// Try to get the file/line number using addr2line
String output;
Error err = OS::get_singleton()->execute(exe_name, args, &output, &ret);
Vector<String> addr2line_results;
if (err == OK) {
addr2line_results = output.substr(0, output.length() - 1).split("\n", false);
}
Vector<String> addr2line_results = output.substr(0, output.length() - 1).split("\n", false);
for (size_t i = 1; i < size; i++) {
char fname[1024];
Dl_info info;
for (size_t i = 1; i < size; i++) {
// Simplify printed file paths to remove redundant `/./` sections (e.g. `/opt/godot/./core` -> `/opt/godot/core`).
print_error(vformat("[%d] %x - %s", (int64_t)i, (uint64_t)bt_buffer[i], addr2line_results[i].replace("/./", "/")));
}
} else {
// Otherwise fall back to trace symbols.
for (size_t i = 1; i < size; i++) {
char fname[1024];
Dl_info info;
snprintf(fname, 1024, "%s", strings[i]);
snprintf(fname, 1024, "%s", strings[i]);
// Try to demangle the function name to provide a more readable one
if (dladdr(bt_buffer[i], &info) && info.dli_sname) {
if (info.dli_sname[0] == '_') {
int status = 0;
char *demangled = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, &status);
// Try to demangle the function name to provide a more readable one.
if (dladdr(bt_buffer[i], &info) && info.dli_sname) {
if (info.dli_sname[0] == '_') {
int status = 0;
char *demangled = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, &status);
if (status == 0 && demangled) {
snprintf(fname, 1024, "%s", demangled);
}
if (status == 0 && demangled) {
snprintf(fname, 1024, "%s", demangled);
}
if (demangled) {
free(demangled);
if (demangled) {
free(demangled);
}
}
}
}
// Simplify printed file paths to remove redundant `/./` sections (e.g. `/opt/godot/./core` -> `/opt/godot/core`).
print_error(vformat("[%d] %x - %s (%s)", (int64_t)i, (uint64_t)bt_buffer[i], fname, err == OK ? addr2line_results[i].replace("/./", "/") : ""));
print_error(vformat("[%d] %x - %s", (int64_t)i, (uint64_t)bt_buffer[i], fname));
}
}
free(strings);