mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 10:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display messages callstack in messages list.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-15 01:22:05 +01:00
parent 49945c7198
commit 12037b88ff
1 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/TracyView.cpp
View File

@ -7721,13 +7721,14 @@ void View::DrawMessages()
ImGui::BeginChild( "##messages" ); ImGui::BeginChild( "##messages" );
const auto w = ImGui::GetWindowWidth(); const auto w = ImGui::GetWindowWidth();
static bool widthSet = false; static bool widthSet = false;
ImGui::Columns( 3 ); ImGui::Columns( 4 );
if( !widthSet ) if( !widthSet )
{ {
widthSet = true; widthSet = true;
ImGui::SetColumnWidth( 0, w * 0.07f ); ImGui::SetColumnWidth( 0, w * 0.07f );
ImGui::SetColumnWidth( 1, w * 0.13f ); ImGui::SetColumnWidth( 1, w * 0.13f );
ImGui::SetColumnWidth( 2, w * 0.8f ); ImGui::SetColumnWidth( 2, w * 0.6f );
ImGui::SetColumnWidth( 3, w * 0.2f );
} }
ImGui::TextUnformatted( "Time" ); ImGui::TextUnformatted( "Time" );
ImGui::SameLine(); ImGui::SameLine();
@ -7737,10 +7738,13 @@ void View::DrawMessages()
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::TextUnformatted( "Message" ); ImGui::TextUnformatted( "Message" );
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::TextUnformatted( "Call stack" );
ImGui::NextColumn();
ImGui::Separator(); ImGui::Separator();
int msgcnt = 0; int msgcnt = 0;
const auto filterActive = m_messageFilter.IsActive(); const auto filterActive = m_messageFilter.IsActive();
int idx = 0;
for( const auto& v : msgs ) for( const auto& v : msgs )
{ {
const auto tid = m_worker.DecompressThread( v->thread ); const auto tid = m_worker.DecompressThread( v->thread );
@ -7750,7 +7754,7 @@ void View::DrawMessages()
if( !filterActive || m_messageFilter.PassFilter( text ) ) if( !filterActive || m_messageFilter.PassFilter( text ) )
{ {
ImGui::PushID( v ); ImGui::PushID( v );
if( ImGui::Selectable( TimeToString( v->time ), m_msgHighlight == v, ImGuiSelectableFlags_SpanAllColumns ) ) if( ImGui::Selectable( TimeToString( v->time ), m_msgHighlight == v, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap ) )
{ {
CenterAtTime( v->time ); CenterAtTime( v->time );
} }
@ -7774,6 +7778,42 @@ void View::DrawMessages()
ImGui::TextWrapped( "%s", text ); ImGui::TextWrapped( "%s", text );
ImGui::PopStyleColor(); ImGui::PopStyleColor();
ImGui::NextColumn(); ImGui::NextColumn();
const auto cs = v->callstack.Val();
if( cs != 0 )
{
#ifdef TRACY_EXTENDED_FONT
SmallCallstackButton( ICON_FA_ALIGN_JUSTIFY, cs, idx );
#else
SmallCallstackButton( ICON_FA_ALIGN_JUSTIFY " Show", cs, idx );
#endif
ImGui::SameLine();
const auto& csdata = m_worker.GetCallstack( cs );
const auto cssz = std::min<int>( csdata.size(), 4 );
bool first = true;
for( int i=0; i<cssz; i++ )
{
const auto frameData = m_worker.GetCallstackFrame( csdata[i] );
if( !frameData ) break;
if( first )
{
first = false;
}
else
{
ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT
TextDisabledUnformatted( ICON_FA_LONG_ARROW_ALT_LEFT );
#else
TextDisabledUnformatted( "<-" );
#endif
ImGui::SameLine();
}
const auto& frame = frameData->data[frameData->size - 1];
auto txt = m_worker.GetString( frame.name );
ImGui::TextUnformatted( txt );
}
}
ImGui::NextColumn();
msgcnt++; msgcnt++;
} }
} }