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

Display explicit names of loaded things.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-07-29 16:56:46 +02:00
parent 821be252d5
commit 18896044c4
3 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/TracyWorker.cpp
View File

@ -257,7 +257,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed ); s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( 0, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Initialization, std::memory_order_relaxed );
f.Read( m_resolution ); f.Read( m_resolution );
f.Read( m_timerMul ); f.Read( m_timerMul );
f.Read( m_data.lastTime ); f.Read( m_data.lastTime );
@ -396,7 +396,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
#endif #endif
s_loadProgress.progress.store( 1, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Locks, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
if( eventMask & EventType::Locks ) if( eventMask & EventType::Locks )
{ {
@ -498,7 +498,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed ); s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( 2, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Messages, std::memory_order_relaxed );
flat_hash_map<uint64_t, MessageData*, nohash<uint64_t>> msgMap; flat_hash_map<uint64_t, MessageData*, nohash<uint64_t>> msgMap;
f.Read( sz ); f.Read( sz );
if( eventMask & EventType::Messages ) if( eventMask & EventType::Messages )
@ -528,7 +528,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
} }
s_loadProgress.progress.store( 3, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Zones, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
m_data.threads.reserve( sz ); m_data.threads.reserve( sz );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
@ -589,7 +589,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} ); } );
#endif #endif
s_loadProgress.progress.store( 4, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::GpuZones, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
m_data.gpuData.reserve( sz ); m_data.gpuData.reserve( sz );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
@ -622,7 +622,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
m_data.gpuData.push_back_no_space_check( ctx ); m_data.gpuData.push_back_no_space_check( ctx );
} }
s_loadProgress.progress.store( 5, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Plots, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
if( eventMask & EventType::Plots ) if( eventMask & EventType::Plots )
{ {
@ -660,7 +660,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed ); s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( 6, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Memory, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
bool reconstructMemAllocPlot = false; bool reconstructMemAllocPlot = false;
if( eventMask & EventType::Memory ) if( eventMask & EventType::Memory )
@ -755,7 +755,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
if( fileVer <= FileVersion( 0, 3, 1 ) ) goto finishLoading; if( fileVer <= FileVersion( 0, 3, 1 ) ) goto finishLoading;
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed ); s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( 7, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::CallStacks, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
m_data.callstackPayload.reserve( sz ); m_data.callstackPayload.reserve( sz );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )

12
server/TracyWorker.hpp
View File

@ -47,6 +47,18 @@ struct UnsupportedVersion : public std::exception
struct LoadProgress struct LoadProgress
{ {
enum Stage
{
Initialization,
Locks,
Messages,
Zones,
GpuZones,
Plots,
Memory,
CallStacks
};
LoadProgress() : total( 0 ), progress( 0 ), subTotal( 0 ), subProgress( 0 ) {} LoadProgress() : total( 0 ), progress( 0 ), subTotal( 0 ), subProgress( 0 ) {}
std::atomic<uint64_t> total; std::atomic<uint64_t> total;

33
standalone/src/main.cpp
View File

@ -197,10 +197,39 @@ int main( int argc, char** argv )
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
totalProgress = currProgress; totalProgress = currProgress;
} }
ImGui::Text( "Total progress: %" PRIu64 "/%" PRIu64, currProgress, totalProgress ); switch( currProgress )
{
case tracy::LoadProgress::Initialization:
ImGui::Text( "Initialization..." );
break;
case tracy::LoadProgress::Locks:
ImGui::Text( "Locks..." );
break;
case tracy::LoadProgress::Messages:
ImGui::Text( "Messages..." );
break;
case tracy::LoadProgress::Zones:
ImGui::Text( "CPU zones..." );
break;
case tracy::LoadProgress::GpuZones:
ImGui::Text( "GPU zones..." );
break;
case tracy::LoadProgress::Plots:
ImGui::Text( "Plots..." );
break;
case tracy::LoadProgress::Memory:
ImGui::Text( "Memory..." );
break;
case tracy::LoadProgress::CallStacks:
ImGui::Text( "Call stacks..." );
break;
default:
assert( false );
break;
}
ImGui::ProgressBar( float( currProgress ) / totalProgress, ImVec2( 200 * dpiScale, 0 ) ); ImGui::ProgressBar( float( currProgress ) / totalProgress, ImVec2( 200 * dpiScale, 0 ) );
ImGui::Text( "Sub progress..." ); ImGui::Text( "Progress..." );
auto subTotal = progress.subTotal.load( std::memory_order_relaxed ); auto subTotal = progress.subTotal.load( std::memory_order_relaxed );
auto subProgress = progress.subProgress.load( std::memory_order_relaxed ); auto subProgress = progress.subProgress.load( std::memory_order_relaxed );
if( subTotal == 0 ) if( subTotal == 0 )