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

No need to check for frame function name match.

Browse Source 
Firstly, the match is not necessarily possible (e.g. on Linux the source
location function names and callstack frame names are two completely
different things).

Secondly, the first current zone callstack frame (which is matched to
some callstack frame of previous zone) is the frame in which a zone was
captured, and it will already be present in the zone trace. The
callstack frame omission should be therefore unconditional.
This commit is contained in:
Bartosz Taudul 2018-06-24 17:38:32 +02:00
parent d7a85983a5
commit c3238a496d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/TracyView.cpp
View File

@ -2774,8 +2774,8 @@ void DrawZoneTrace( T zone, const std::vector<T>& trace, const Worker& worker, s
auto& prevCs = worker.GetCallstack( prev->callstack );
auto& currCs = worker.GetCallstack( curr->callstack );
const auto psz = prevCs.size();
uint8_t idx;
const auto psz = int8_t( prevCs.size() );
int8_t idx;
for( idx=0; idx<psz; idx++ )
{
auto pf = prevCs[idx];
@ -2784,17 +2784,14 @@ void DrawZoneTrace( T zone, const std::vector<T>& trace, const Worker& worker, s
{
if( cf == pf )
{
auto frame = worker.GetCallstackFrame( prevCs[idx-1] );
auto pname = worker.GetString( frame->name );
auto cname = worker.GetString( worker.GetSourceLocation( curr->srcloc ).function );
if( pname == cname ) idx--;
idx--;
found = true;
break;
}
}
if( found ) break;
}
for( uint8_t j=1; j<idx; j++ )
for( int8_t j=1; j<idx; j++ )
{
auto frame = worker.GetCallstackFrame( prevCs[j] );
ImGui::TextDisabled( "%s", worker.GetString( frame->name ) );