refs #540 Fixed getStackTrace for Linux.

This commit is contained in:
Mathew Sutcliffe
2015-12-11 22:41:51 +00:00
parent 6139818138
commit 3064b319c6

View File

@@ -9,6 +9,7 @@
#include "blackmisc/stacktrace.h" #include "blackmisc/stacktrace.h"
#include <QMutex> #include <QMutex>
#include <QStringBuilder>
#include <array> #include <array>
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
# include <windows.h> # include <windows.h>
@@ -18,6 +19,8 @@
# pragma warning(pop) # pragma warning(pop)
#elif defined(Q_CC_GNU) #elif defined(Q_CC_GNU)
# include <execinfo.h> # include <execinfo.h>
# include <cxxabi.h>
# include <cstring>
#endif #endif
namespace BlackMisc namespace BlackMisc
@@ -69,17 +72,30 @@ namespace BlackMisc
auto *symbols = backtrace_symbols(stack.data(), frames); auto *symbols = backtrace_symbols(stack.data(), frames);
QStringList result; QStringList result;
QString symbol;
char *demangled = nullptr; char *demangled = nullptr;
size_t size = 0; size_t size = 0;
for (int i = 0; i < frames; ++i) for (int i = 0; i < frames; ++i)
{ {
symbol = symbols[i]; // Using C string functions to avoid unnecessary dynamic memory allocation
int end = symbol.indexOf(' '); auto *basename = std::strrchr(symbols[i], '/');
if (end > 0) { symbol.truncate(end); } if (! basename) { continue; }
basename++;
auto *symbol = std::strchr(basename, '(');
if (! symbol) { continue; }
auto *basenameEnd = symbol++;
auto *end = std::strrchr(symbol, ')');
if (! end) { continue; }
auto *offset = std::strrchr(symbol, '+');
auto *symbolEnd = offset ? offset++ : end;
demangled = abi::__cxa_demangle(qPrintable(symbol), demangled, &size, nullptr); auto *temp = demangled; // avoid leaking memory if __cxa_demangle returns nullptr
result.push_back(demangled);
demangled = abi::__cxa_demangle(QByteArray(symbol, symbolEnd - symbol).constData(), demangled, &size, nullptr);
auto details = '(' % QLatin1String(basename, basenameEnd - basename) % ' ' % QLatin1String(symbol, end - symbol) % ')';
result.push_back(demangled ? QLatin1String(demangled) % ' ' % details : QString(details));
if (! demangled) { demangled = temp; }
} }
free(symbols); free(symbols);
free(demangled); free(demangled);