Save/load context switch data.

This commit is contained in:
Bartosz Taudul 2019-08-13 00:56:57 +02:00
parent 1c937ad9bb
commit 9417ad994d
3 changed files with 88 additions and 9 deletions

View File

@ -622,6 +622,9 @@ int main( int argc, char** argv )
case tracy::LoadProgress::FrameImages: case tracy::LoadProgress::FrameImages:
ImGui::TextUnformatted( "Frame images..." ); ImGui::TextUnformatted( "Frame images..." );
break; break;
case tracy::LoadProgress::ContextSwitches:
ImGui::TextUnformatted( "Context switches..." );
break;
default: default:
assert( false ); assert( false );
break; break;

View File

@ -304,10 +304,14 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
{ {
s_loadProgress.total.store( 8, std::memory_order_relaxed ); s_loadProgress.total.store( 8, std::memory_order_relaxed );
} }
else else if( fileVer <= FileVersion( 0, 5, 0 ) )
{ {
s_loadProgress.total.store( 9, std::memory_order_relaxed ); s_loadProgress.total.store( 9, std::memory_order_relaxed );
} }
else
{
s_loadProgress.total.store( 10, std::memory_order_relaxed );
}
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed ); s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( LoadProgress::Initialization, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::Initialization, std::memory_order_relaxed );
@ -1141,6 +1145,50 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
} }
if( fileVer >= FileVersion( 0, 5, 1 ) )
{
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( LoadProgress::ContextSwitches, std::memory_order_relaxed );
if( eventMask & EventType::ContextSwitches )
{
f.Read( sz );
s_loadProgress.subTotal.store( sz, std::memory_order_relaxed );
m_data.ctxSwitch.reserve( sz );
for( uint64_t i=0; i<sz; i++ )
{
s_loadProgress.subProgress.store( i, std::memory_order_relaxed );
uint64_t thread, csz;
f.Read2( thread, csz );
auto data = m_slab.AllocInit<ContextSwitch>();
data->v.reserve_exact( csz, m_slab );
int64_t refTime = 0;
auto ptr = data->v.data();
for( uint64_t j=0; j<csz; j++ )
{
ptr->start = ReadTimeOffset( f, refTime );
ptr->end = ReadTimeOffset( f, refTime );
f.Read( &ptr->cpu, sizeof( ptr->cpu ) + sizeof( ptr->reason ) + sizeof( ptr->state ) );
ptr++;
}
m_data.ctxSwitch.emplace( thread, data );
}
}
else
{
f.Read( sz );
s_loadProgress.subTotal.store( sz, std::memory_order_relaxed );
for( uint64_t i=0; i<sz; i++ )
{
s_loadProgress.subProgress.store( i, std::memory_order_relaxed );
f.Skip( sizeof( uint64_t ) );
uint64_t csz;
f.Read( csz );
f.Skip( csz * sizeof( ContextSwitchData ) );
}
}
}
s_loadProgress.total.store( 0, std::memory_order_relaxed ); s_loadProgress.total.store( 0, std::memory_order_relaxed );
m_loadTime = std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - loadStart ).count(); m_loadTime = std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - loadStart ).count();
@ -4426,6 +4474,32 @@ void Worker::Write( FileWrite& f )
const auto image = UnpackFrameImage( *fi ); const auto image = UnpackFrameImage( *fi );
f.Write( image, fi->w * fi->h / 2 ); f.Write( image, fi->w * fi->h / 2 );
} }
// Only save context switches relevant to active threads.
std::vector<flat_hash_map<uint64_t, ContextSwitch*, nohash<uint64_t>>::const_iterator> ctxValid;
ctxValid.reserve( m_data.ctxSwitch.size() );
for( auto it = m_data.ctxSwitch.begin(); it != m_data.ctxSwitch.end(); ++it )
{
if( m_data.threadMap.find( it->first ) != m_data.threadMap.end() )
{
ctxValid.emplace_back( it );
}
}
sz = ctxValid.size();
f.Write( &sz, sizeof( sz ) );
for( auto& ctx : ctxValid )
{
f.Write( &ctx->first, sizeof( ctx->first ) );
sz = ctx->second->v.size();
f.Write( &sz, sizeof( sz ) );
int64_t refTime = 0;
for( auto& cs : ctx->second->v )
{
WriteTimeOffset( f, refTime, cs.start );
WriteTimeOffset( f, refTime, cs.end );
f.Write( &cs.cpu, sizeof( cs.cpu ) + sizeof( cs.reason ) + sizeof( cs.state ) );
}
}
} }
void Worker::WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec, int64_t& refTime ) void Worker::WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec, int64_t& refTime )

View File

@ -35,6 +35,7 @@ namespace EventType
Plots = 1 << 2, Plots = 1 << 2,
Memory = 1 << 3, Memory = 1 << 3,
FrameImages = 1 << 4, FrameImages = 1 << 4,
ContextSwitches = 1 << 5,
None = 0, None = 0,
All = std::numeric_limits<uint32_t>::max() All = std::numeric_limits<uint32_t>::max()
@ -65,7 +66,8 @@ struct LoadProgress
Plots, Plots,
Memory, Memory,
CallStacks, CallStacks,
FrameImages FrameImages,
ContextSwitches
}; };
LoadProgress() : total( 0 ), progress( 0 ), subTotal( 0 ), subProgress( 0 ) {} LoadProgress() : total( 0 ), progress( 0 ), subTotal( 0 ), subProgress( 0 ) {}