mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-14 04:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't alias struct names in client and server.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-08-20 17:38:29 +02:00
parent 7cf3b0b004
commit 960c7fb1b9
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/TracyCallstack.cpp
View File

@ -222,9 +222,9 @@ static const char* GetModuleName( uint64_t addr )
return "[unknown]"; return "[unknown]";
} }
SymbolData DecodeSymbolAddress( uint64_t ptr ) CallstackSymbolData DecodeSymbolAddress( uint64_t ptr )
{ {
SymbolData sym; CallstackSymbolData sym;
IMAGEHLP_LINE64 line; IMAGEHLP_LINE64 line;
DWORD displacement = 0; DWORD displacement = 0;
line.SizeOfStruct = sizeof(IMAGEHLP_LINE64); line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
@ -242,9 +242,9 @@ SymbolData DecodeSymbolAddress( uint64_t ptr )
return sym; return sym;
} }
SymbolData DecodeCodeAddress( uint64_t ptr ) CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
{ {
SymbolData sym; CallstackSymbolData sym;
const auto proc = GetCurrentProcess(); const auto proc = GetCurrentProcess();
bool done = false; bool done = false;
@ -442,7 +442,7 @@ const char* DecodeCallstackPtrFast( uint64_t ptr )
static int SymbolAddressDataCb( void* data, uintptr_t pc, uintptr_t lowaddr, const char* fn, int lineno, const char* function ) static int SymbolAddressDataCb( void* data, uintptr_t pc, uintptr_t lowaddr, const char* fn, int lineno, const char* function )
{ {
auto& sym = *(SymbolData*)data; auto& sym = *(CallstackSymbolData*)data;
if( !fn ) if( !fn )
{ {
sym.file = "[unknown]"; sym.file = "[unknown]";
@ -461,20 +461,20 @@ static int SymbolAddressDataCb( void* data, uintptr_t pc, uintptr_t lowaddr, con
static void SymbolAddressErrorCb( void* data, const char* /*msg*/, int /*errnum*/ ) static void SymbolAddressErrorCb( void* data, const char* /*msg*/, int /*errnum*/ )
{ {
auto& sym = *(SymbolData*)data; auto& sym = *(CallstackSymbolData*)data;
sym.file = "[unknown]"; sym.file = "[unknown]";
sym.line = 0; sym.line = 0;
sym.needFree = false; sym.needFree = false;
} }
SymbolData DecodeSymbolAddress( uint64_t ptr ) CallstackSymbolData DecodeSymbolAddress( uint64_t ptr )
{ {
SymbolData sym; CallstackSymbolData sym;
backtrace_pcinfo( cb_bts, ptr, SymbolAddressDataCb, SymbolAddressErrorCb, &sym ); backtrace_pcinfo( cb_bts, ptr, SymbolAddressDataCb, SymbolAddressErrorCb, &sym );
return sym; return sym;
} }
SymbolData DecodeCodeAddress( uint64_t ptr ) CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
{ {
return DecodeSymbolAddress( ptr ); return DecodeSymbolAddress( ptr );
} }
@ -637,16 +637,16 @@ const char* DecodeCallstackPtrFast( uint64_t ptr )
return ret; return ret;
} }
SymbolData DecodeSymbolAddress( uint64_t ptr ) CallstackSymbolData DecodeSymbolAddress( uint64_t ptr )
{ {
const char* symloc = nullptr; const char* symloc = nullptr;
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 SymbolData { symloc, 0, false }; return CallstackSymbolData { symloc, 0, false };
} }
SymbolData DecodeCodeAddress( uint64_t ptr ) CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
{ {
return DecodeSymbolAddress( ptr ); return DecodeSymbolAddress( ptr );
} }

6
client/TracyCallstack.hpp
View File

@ -22,7 +22,7 @@
namespace tracy namespace tracy
{ {
struct SymbolData struct CallstackSymbolData
{ {
const char* file; const char* file;
uint32_t line; uint32_t line;
@ -45,8 +45,8 @@ struct CallstackEntryData
const char* imageName; const char* imageName;
}; };
SymbolData DecodeSymbolAddress( uint64_t ptr ); CallstackSymbolData DecodeSymbolAddress( uint64_t ptr );
SymbolData DecodeCodeAddress( uint64_t ptr ); CallstackSymbolData DecodeCodeAddress( uint64_t ptr );
const char* DecodeCallstackPtrFast( uint64_t ptr ); const char* DecodeCallstackPtrFast( uint64_t ptr );
CallstackEntryData DecodeCallstackPtr( uint64_t ptr ); CallstackEntryData DecodeCallstackPtr( uint64_t ptr );
void InitCallstack(); void InitCallstack();