drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/std] Cleanup stacktrace code

Browse Source
This commit is contained in:
Gary Talent 2021-10-29 21:51:06 -05:00
parent ceb876b6ae
commit 708d7382d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/ox/src/ox/std/stacktrace.cpp vendored
View File

@ -33,7 +33,7 @@ static Vector<String> symbolicate([[maybe_unused]]const char **frames, [[maybe_u
Dl_info info; Dl_info info;
if (dladdr(frames[i], &info) && info.dli_sname) { if (dladdr(frames[i], &info) && info.dli_sname) {
int status = -1; int status = -1;
const auto name = abi::__cxa_demangle(info.dli_sname, nullptr, 0, &status); const auto name = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, &status);
if (status == 0) { if (status == 0) {
out.emplace_back(sfmt("{}: {}", i, name)); out.emplace_back(sfmt("{}: {}", i, name));
continue; continue;
@ -51,9 +51,9 @@ static Vector<String> symbolicate([[maybe_unused]]const char **frames, [[maybe_u
void printStackTrace([[maybe_unused]]unsigned shave) noexcept { void printStackTrace([[maybe_unused]]unsigned shave) noexcept {
#if defined(OX_USE_STDLIB) && __has_include(<unistd.h>) #if defined(OX_USE_STDLIB) && __has_include(<unistd.h>)
Vector<void*> frames(1000); Vector<void*> frames(1000);
frames.resize(static_cast<std::size_t>(backtrace(frames.data(), frames.size()))); frames.resize(static_cast<std::size_t>(backtrace(frames.data(), static_cast<int>(frames.size()))));
if (frames.size() - shave > 2) { if (frames.size() - shave > 2) {
const auto symbols = backtrace_symbols(frames.data() + shave, frames.size() - shave); const auto symbols = backtrace_symbols(frames.data() + shave, static_cast<int>(frames.size() - shave));
const auto symbolicatedStacktrace = symbolicate(bit_cast<const char**>(frames.data() + shave), frames.size() - shave, "\t"); const auto symbolicatedStacktrace = symbolicate(bit_cast<const char**>(frames.data() + shave), frames.size() - shave, "\t");
free(symbols); free(symbols);
oxErr("Stacktrace:\n"); oxErr("Stacktrace:\n");