mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take callstack field in ZoneEvent into account in save/load.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-06-22 01:30:08 +02:00
parent e40c5068c9
commit 4992ae6b39
2 changed files with 68 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
server/TracyWorker.cpp
View File

@ -453,7 +453,14 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
f.Read( tid ); f.Read( tid );
td->id = tid; td->id = tid;
f.Read( td->count ); f.Read( td->count );
ReadTimeline( f, td->timeline, CompressThread( tid ) ); if( fileVer <= FileVersion( 0, 3, 1 ) )
{
ReadTimelinePre032( f, td->timeline, CompressThread( tid ) );
}
else
{
ReadTimeline( f, td->timeline, CompressThread( tid ) );
}
uint64_t msz; uint64_t msz;
f.Read( msz ); f.Read( msz );
if( eventMask & EventType::Messages ) if( eventMask & EventType::Messages )
@ -2340,6 +2347,16 @@ void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread
} }
} }
void Worker::ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread )
{
uint64_t sz;
f.Read( sz );
if( sz != 0 )
{
ReadTimelinePre032( f, vec, thread, sz );
}
}
void Worker::ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec ) void Worker::ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec )
{ {
uint64_t sz; uint64_t sz;
@ -2360,6 +2377,34 @@ void Worker::ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec )
} }
} }
void Worker::ReadTimelineUpdateStatistics( ZoneEvent* zone, uint16_t thread )
{
#ifndef TRACY_NO_STATISTICS
auto it = m_data.sourceLocationZones.find( zone->srcloc );
assert( it != m_data.sourceLocationZones.end() );
auto& ztd = it->second.zones.push_next();
ztd.zone = zone;
ztd.thread = thread;
if( zone->end >= 0 )
{
auto timeSpan = zone->end - zone->start;
if( timeSpan > 0 )
{
it->second.min = std::min( it->second.min, timeSpan );
it->second.max = std::max( it->second.max, timeSpan );
it->second.total += timeSpan;
for( auto& v : zone->child )
{
const auto childSpan = std::max( int64_t( 0 ), v->end - v->start );
timeSpan -= childSpan;
}
it->second.selfTotal += timeSpan;
}
}
#endif
}
void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size ) void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size )
{ {
assert( size != 0 ); assert( size != 0 );
@ -2374,31 +2419,26 @@ void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread
f.Read( zone, sizeof( ZoneEvent ) - sizeof( ZoneEvent::child ) ); f.Read( zone, sizeof( ZoneEvent ) - sizeof( ZoneEvent::child ) );
ReadTimeline( f, zone->child, thread ); ReadTimeline( f, zone->child, thread );
ReadTimelineUpdateStatistics( zone, thread );
}
}
#ifndef TRACY_NO_STATISTICS void Worker::ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size )
auto it = m_data.sourceLocationZones.find( zone->srcloc ); {
assert( it != m_data.sourceLocationZones.end() ); assert( size != 0 );
auto& ztd = it->second.zones.push_next(); vec.reserve_non_zero( size );
ztd.zone = zone; m_data.zonesCnt += size;
ztd.thread = thread;
if( zone->end >= 0 ) for( uint64_t i=0; i<size; i++ )
{ {
auto timeSpan = zone->end - zone->start; auto zone = m_slab.Alloc<ZoneEvent>();
if( timeSpan > 0 ) vec.push_back_no_space_check( zone );
{ new( &zone->child ) decltype( zone->child );
it->second.min = std::min( it->second.min, timeSpan );
it->second.max = std::max( it->second.max, timeSpan ); f.Read( zone, 26 );
it->second.total += timeSpan; zone->callstack = 0;
for( auto& v : zone->child ) ReadTimelinePre032( f, zone->child, thread );
{ ReadTimelineUpdateStatistics( zone, thread );
const auto childSpan = std::max( int64_t( 0 ), v->end - v->start );
timeSpan -= childSpan;
}
it->second.selfTotal += timeSpan;
}
}
#endif
} }
} }

4
server/TracyWorker.hpp
View File

@ -282,10 +282,14 @@ private:
uint16_t CompressThreadNew( uint64_t thread ); uint16_t CompressThreadNew( uint64_t thread );
tracy_force_inline void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread ); tracy_force_inline void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread );
tracy_force_inline void ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread );
tracy_force_inline void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec ); tracy_force_inline void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec );
tracy_force_inline void ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec ); tracy_force_inline void ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec );
tracy_force_inline void ReadTimelineUpdateStatistics( ZoneEvent* zone, uint16_t thread );
void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size ); void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size );
void ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size );
void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec, uint64_t size ); void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec, uint64_t size );
void ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec, uint64_t size ); void ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec, uint64_t size );