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

Display inline frames in all call stacks.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-27 20:55:58 +01:00
parent 38c4909d96
commit 8d784f7fae
1 changed files with 87 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
server/TracyView.cpp
View File

@ -42,6 +42,15 @@
namespace tracy namespace tracy
{ {
static const char* s_tracyStackFrames[] = {
"tracy::Callstack",
"tracy::Profiler::SendCallstack",
"tracy::ScopedZone::{ctor}",
"tracy::Profiler::SendCallstack(int, unsigned long)",
"tracy::ScopedZone::ScopedZone(tracy::SourceLocationData const*, int, bool)",
nullptr
};
static const char* IntTable100 = static const char* IntTable100 =
"00010203040506070809" "00010203040506070809"
"10111213141516171819" "10111213141516171819"
@ -6457,28 +6466,60 @@ void View::DrawFindZone()
if( group->first != 0 ) if( group->first != 0 )
{ {
ImGui::SameLine(); ImGui::SameLine();
int fidx = 0; int idx = 0;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
SmallCallstackButton( " " ICON_FA_ALIGN_JUSTIFY " ", group->first, fidx, false ); SmallCallstackButton( " " ICON_FA_ALIGN_JUSTIFY " ", group->first, idx, false );
#else #else
SmallCallstackButton( "Call stack", group->first, fidx, false ); SmallCallstackButton( "Call stack", group->first, idx, false );
#endif #endif
int fidx = 0;
ImGui::Spacing(); ImGui::Spacing();
ImGui::Indent(); ImGui::Indent();
auto& csdata = m_worker.GetCallstack( group->first ); auto& csdata = m_worker.GetCallstack( group->first );
for( auto& entry : csdata ) for( auto& entry : csdata )
{ {
ImGui::TextDisabled( "%i.", fidx++ ); auto frameData = m_worker.GetCallstackFrame( entry );
ImGui::SameLine(); if( !frameData )
auto frame = m_worker.GetCallstackFrame( entry );
if( !frame )
{ {
ImGui::Text( "0x%" PRIX64, entry ); ImGui::TextDisabled( "%i.", fidx++ );
ImGui::SameLine();
ImGui::Text( "%p", (void*)entry );
} }
else else
{ {
ImGui::TextUnformatted( m_worker.GetString( frame->data[frame->size-1].name ) ); const auto fsz = frameData->size;
for( uint8_t f=0; f<fsz; f++ )
{
const auto& frame = frameData->data[f];
auto txt = m_worker.GetString( frame.name );
if( fidx == 0 && f != fsz-1 )
{
auto test = s_tracyStackFrames;
bool match = false;
do
{
if( strcmp( txt, *test ) == 0 )
{
match = true;
break;
}
}
while( *++test );
if( match ) continue;
}
if( f == fsz-1 )
{
ImGui::TextDisabled( "%i.", fidx++ );
}
else
{
TextDisabledUnformatted( "--" );
}
ImGui::SameLine();
ImGui::TextUnformatted( txt );
}
} }
} }
ImGui::Unindent(); ImGui::Unindent();
@ -7397,15 +7438,6 @@ void View::DrawStatistics()
ImGui::End(); ImGui::End();
} }
static const char* s_tracyStackFrames[] = {
"tracy::Callstack",
"tracy::Profiler::SendCallstack",
"tracy::ScopedZone::{ctor}",
"tracy::Profiler::SendCallstack(int, unsigned long)",
"tracy::ScopedZone::ScopedZone(tracy::SourceLocationData const*, int, bool)",
nullptr
};
void View::DrawCallstackWindow() void View::DrawCallstackWindow()
{ {
bool show = true; bool show = true;
@ -9449,16 +9481,47 @@ void View::CallstackTooltip( uint32_t idx )
int fidx = 0; int fidx = 0;
for( auto& entry : cs ) for( auto& entry : cs )
{ {
ImGui::TextDisabled( "%i.", fidx++ ); auto frameData = m_worker.GetCallstackFrame( entry );
ImGui::SameLine(); if( !frameData )
auto frame = m_worker.GetCallstackFrame( entry );
if( !frame )
{ {
ImGui::Text( "0x%" PRIX64, entry ); ImGui::TextDisabled( "%i.", fidx++ );
ImGui::SameLine();
ImGui::Text( "%p", (void*)entry );
} }
else else
{ {
ImGui::TextUnformatted( m_worker.GetString( frame->data[frame->size-1].name ) ); const auto fsz = frameData->size;
for( uint8_t f=0; f<fsz; f++ )
{
const auto& frame = frameData->data[f];
auto txt = m_worker.GetString( frame.name );
if( fidx == 0 && f != fsz-1 )
{
auto test = s_tracyStackFrames;
bool match = false;
do
{
if( strcmp( txt, *test ) == 0 )
{
match = true;
break;
}
}
while( *++test );
if( match ) continue;
}
if( f == fsz-1 )
{
ImGui::TextDisabled( "%i.", fidx++ );
}
else
{
TextDisabledUnformatted( "--" );
}
ImGui::SameLine();
ImGui::TextUnformatted( txt );
}
} }
} }
ImGui::EndTooltip(); ImGui::EndTooltip();