mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return symbol address in DecodeCodeAddress().

Browse Source
This commit is contained in:
Bartosz Taudul 2021-06-19 19:02:08 +02:00
parent cc0ca341bb
commit 3ce2f6209a
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/TracyCallstack.cpp
View File

@ -397,6 +397,7 @@ CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
{ {
sym.file = line.FileName; sym.file = line.FileName;
sym.line = line.LineNumber; sym.line = line.LineNumber;
sym.symAddr = line.Address;
done = true; done = true;
} }
} }
@ -408,11 +409,13 @@ CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
{ {
sym.file = "[unknown]"; sym.file = "[unknown]";
sym.line = 0; sym.line = 0;
sym.symAddr = 0;
} }
else else
{ {
sym.file = line.FileName; sym.file = line.FileName;
sym.line = line.LineNumber; sym.line = line.LineNumber;
sym.symAddr = line.Address;
} }
} }
#ifdef TRACY_DBGHELP_LOCK #ifdef TRACY_DBGHELP_LOCK
@ -742,6 +745,7 @@ static int CodeDataCb( void* data, uintptr_t pc, uintptr_t lowaddr, const char*
sym.file = CopyString( fn ); sym.file = CopyString( fn );
sym.line = lineno; sym.line = lineno;
sym.needFree = true; sym.needFree = true;
sym.symAddr = lowaddr;
return 1; return 1;
} }
@ -751,7 +755,7 @@ static void CodeErrorCb( void* /*data*/, const char* /*msg*/, int /*errnum*/ )
CallstackSymbolData DecodeCodeAddress( uint64_t ptr ) CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
{ {
CallstackSymbolData sym = { "[unknown]", 0, false }; CallstackSymbolData sym = { "[unknown]", 0, false, 0 };
backtrace_pcinfo( cb_bts, ptr, CodeDataCb, CodeErrorCb, &sym ); backtrace_pcinfo( cb_bts, ptr, CodeDataCb, CodeErrorCb, &sym );
return sym; return sym;
} }
@ -944,7 +948,7 @@ CallstackSymbolData DecodeSymbolAddress( uint64_t ptr )
Dl_info dlinfo; Dl_info dlinfo;
if( dladdr( (void*)ptr, &dlinfo ) ) symloc = dlinfo.dli_fname; if( dladdr( (void*)ptr, &dlinfo ) ) symloc = dlinfo.dli_fname;
if( !symloc ) symloc = "[unknown]"; if( !symloc ) symloc = "[unknown]";
return CallstackSymbolData { symloc, 0, false }; return CallstackSymbolData { symloc, 0, false, 0 };
} }
CallstackSymbolData DecodeCodeAddress( uint64_t ptr ) CallstackSymbolData DecodeCodeAddress( uint64_t ptr )

1
client/TracyCallstack.hpp
View File

@ -27,6 +27,7 @@ struct CallstackSymbolData
const char* file; const char* file;
uint32_t line; uint32_t line;
bool needFree; bool needFree;
uint64_t symAddr;
}; };
struct CallstackEntry struct CallstackEntry