1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logging: cache the last library file name in a backtrace

Browse Source 
They usually come in groups, so this avoids extra work.

Change-Id: Ic15405335d804bdea761fffd16d4fb5c41e122f0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Thiago Macieira 2022-02-18 12:28:57 -08:00
parent ff2535de5c
commit bd728d1149
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/global/qlogging.cpp
View File

@ -1335,6 +1335,8 @@ static QStringList backtraceFramesForLogMessage(int frameCount)
# if QT_CONFIG(dladdr) # if QT_CONFIG(dladdr)
// use dladdr() instead of backtrace_symbols() // use dladdr() instead of backtrace_symbols()
QString cachedLibrary;
const char *cachedFname = nullptr;
auto decodeFrame = [&](const void *addr) -> DecodedFrame { auto decodeFrame = [&](const void *addr) -> DecodedFrame {
Dl_info info; Dl_info info;
if (!dladdr(addr, &info)) if (!dladdr(addr, &info))
@ -1351,9 +1353,12 @@ static QStringList backtraceFramesForLogMessage(int frameCount)
if (shouldSkipFrame(lib, fn)) if (shouldSkipFrame(lib, fn))
return {}; return {};
QString library = QString::fromUtf8(lib.data(), lib.size());
QString function = demangled(fn); QString function = demangled(fn);
return { library, function }; if (lib.data() != cachedFname) {
cachedFname = lib.data();
cachedLibrary = QString::fromUtf8(cachedFname, lib.size());
}
return { cachedLibrary, function };
}; };
# else # else
// The results of backtrace_symbols looks like this: // The results of backtrace_symbols looks like this: