mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-09 16:23:54 +00:00
Code Issues Releases Wiki Activity

Display threads ids as base-10 numbers.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-08-24 23:41:33 +02:00
parent deb59b4c38
commit 2b9ec14c92
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/TracyView.cpp
View File

@ -345,7 +345,7 @@ bool View::Draw()
{ {
TextFocused( "Thread:", s_instance->m_worker.GetThreadString( data.thread ) ); TextFocused( "Thread:", s_instance->m_worker.GetThreadString( data.thread ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", data.thread ); ImGui::TextDisabled( "(%s)", RealToString( data.thread, true ) );
} }
ImGui::Separator(); ImGui::Separator();
if( ImGui::Button( "I understand" ) ) if( ImGui::Button( "I understand" ) )
@ -2057,7 +2057,7 @@ void View::DrawZones()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( m_worker.GetThreadString( v->id ) ); ImGui::TextUnformatted( m_worker.GetThreadString( v->id ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIx64 ")", v->id ); ImGui::TextDisabled( "(%s)", RealToString( v->id, true ) );
if( crash.thread == v->id ) if( crash.thread == v->id )
{ {
ImGui::SameLine(); ImGui::SameLine();
@ -4052,7 +4052,7 @@ int View::DrawCpuData( int offset, double pxns, const ImVec2& wpos, bool hover,
TextDisabledUnformatted( "(profiled program)" ); TextDisabledUnformatted( "(profiled program)" );
TextFocused( "Thread:", m_worker.GetThreadString( thread ) ); TextFocused( "Thread:", m_worker.GetThreadString( thread ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", thread ); ImGui::TextDisabled( "(%s)", RealToString( thread, true ) );
} }
else else
{ {
@ -4068,7 +4068,7 @@ int View::DrawCpuData( int offset, double pxns, const ImVec2& wpos, bool hover,
} }
TextFocused( "Thread:", m_worker.GetExternalName( thread ).second ); TextFocused( "Thread:", m_worker.GetExternalName( thread ).second );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", thread ); ImGui::TextDisabled( "(%s)", RealToString( thread, true ) );
} }
ImGui::Separator(); ImGui::Separator();
TextFocused( "Start time:", TimeToString( start ) ); TextFocused( "Start time:", TimeToString( start ) );
@ -4599,7 +4599,7 @@ void View::DrawPlotPoint( const ImVec2& wpos, float x, float y, int offset, uint
} }
TextFocused( "Thread:", m_worker.GetThreadString( tid ) ); TextFocused( "Thread:", m_worker.GetThreadString( tid ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tid ); ImGui::TextDisabled( "(%s)", RealToString( tid, true ) );
m_memoryAllocHover = std::distance( mem.data.begin(), ev ); m_memoryAllocHover = std::distance( mem.data.begin(), ev );
m_memoryAllocHoverWait = 2; m_memoryAllocHoverWait = 2;
@ -4918,7 +4918,7 @@ void View::DrawZoneInfoWindow()
ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line ); ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line );
TextFocused( "Thread:", m_worker.GetThreadString( tid ) ); TextFocused( "Thread:", m_worker.GetThreadString( tid ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tid ); ImGui::TextDisabled( "(%s)", RealToString( tid, true ) );
if( ev.text.active ) if( ev.text.active )
{ {
TextFocused( "User text:", m_worker.GetString( ev.text ) ); TextFocused( "User text:", m_worker.GetString( ev.text ) );
@ -5664,7 +5664,7 @@ void View::DrawGpuInfoWindow()
ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line ); ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line );
TextFocused( "Thread:", m_worker.GetThreadString( tid ) ); TextFocused( "Thread:", m_worker.GetThreadString( tid ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tid ); ImGui::TextDisabled( "(%s)", RealToString( tid, true ) );
ImGui::Separator(); ImGui::Separator();
ImGui::BeginChild( "##gpuinfo" ); ImGui::BeginChild( "##gpuinfo" );
@ -6684,7 +6684,7 @@ void View::DrawMessages()
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::TextUnformatted( m_worker.GetThreadString( v->thread ) ); ImGui::TextUnformatted( m_worker.GetThreadString( v->thread ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", v->thread ); ImGui::TextDisabled( "(%s)", RealToString( v->thread, true ) );
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::PushStyleColor( ImGuiCol_Text, v->color ); ImGui::PushStyleColor( ImGuiCol_Text, v->color );
ImGui::TextWrapped( "%s", text ); ImGui::TextWrapped( "%s", text );
@ -9276,7 +9276,7 @@ void View::DrawMemoryAllocWindow()
ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine(); ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine();
TextFocused( "Thread:", m_worker.GetThreadString( tidAlloc ) ); TextFocused( "Thread:", m_worker.GetThreadString( tidAlloc ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tidAlloc ); ImGui::TextDisabled( "(%s)", RealToString( tidAlloc, true ) );
if( ev.csAlloc != 0 ) if( ev.csAlloc != 0 )
{ {
ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine(); ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine();
@ -9293,7 +9293,7 @@ void View::DrawMemoryAllocWindow()
ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine(); ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine();
TextFocused( "Thread:", m_worker.GetThreadString( tidFree ) ); TextFocused( "Thread:", m_worker.GetThreadString( tidFree ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tidFree ); ImGui::TextDisabled( "(%s)", RealToString( tidFree, true ) );
if( ev.csFree != 0 ) if( ev.csFree != 0 )
{ {
ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine(); ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine();
@ -9971,7 +9971,7 @@ void View::DrawInfo()
TextFocused( "Time of crash:", TimeToString( crash.time ) ); TextFocused( "Time of crash:", TimeToString( crash.time ) );
TextFocused( "Thread:", m_worker.GetThreadString( crash.thread ) ); TextFocused( "Thread:", m_worker.GetThreadString( crash.thread ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", crash.thread ); ImGui::TextDisabled( "(%s)", RealToString( crash.thread, true ) );
TextDisabledUnformatted( "Reason:" ); TextDisabledUnformatted( "Reason:" );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextWrapped( "%s", m_worker.GetString( crash.message ) ); ImGui::TextWrapped( "%s", m_worker.GetString( crash.message ) );
@ -10213,7 +10213,7 @@ void View::DrawLockInfoWindow()
{ {
ImGui::TextUnformatted( m_worker.GetThreadString( t ) ); ImGui::TextUnformatted( m_worker.GetThreadString( t ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", t ); ImGui::TextDisabled( "(%s)", RealToString( t, true ) );
} }
ImGui::TreePop(); ImGui::TreePop();
} }
@ -11700,7 +11700,7 @@ void View::ZoneTooltip( const ZoneEvent& ev )
ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line ); ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line );
TextFocused( "Thread:", m_worker.GetThreadString( tid ) ); TextFocused( "Thread:", m_worker.GetThreadString( tid ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tid ); ImGui::TextDisabled( "(%s)", RealToString( tid, true ) );
ImGui::Separator(); ImGui::Separator();
TextFocused( "Execution time:", TimeToString( ztime ) ); TextFocused( "Execution time:", TimeToString( ztime ) );
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
@ -11753,7 +11753,7 @@ void View::ZoneTooltip( const GpuEvent& ev )
ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line ); ImGui::Text( "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line );
TextFocused( "Thread:", m_worker.GetThreadString( tid ) ); TextFocused( "Thread:", m_worker.GetThreadString( tid ) );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(0x%" PRIX64 ")", tid ); ImGui::TextDisabled( "(%s)", RealToString( tid, true ) );
ImGui::Separator(); ImGui::Separator();
TextFocused( "GPU execution time:", TimeToString( ztime ) ); TextFocused( "GPU execution time:", TimeToString( ztime ) );
TextFocused( "GPU self time:", TimeToString( selftime ) ); TextFocused( "GPU self time:", TimeToString( selftime ) );