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

Count zones at zone end, not zone begin.

Browse Source 
This makes sure only finished, non-zero-timespan zones are counted in
the statistics.
This commit is contained in:
Bartosz Taudul 2020-01-23 19:03:03 +01:00
parent 23601904cd
commit e31b529b4a
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
server/TracyWorker.cpp
View File

@ -326,6 +326,15 @@ Worker::Worker( const std::string& program, const std::vector<ImportEventTimelin
auto& stack = td->stack; auto& stack = td->stack;
auto zone = stack.back_and_pop(); auto zone = stack.back_and_pop();
zone->SetEnd( v.timestamp ); zone->SetEnd( v.timestamp );
#ifndef TRACY_NO_STATISTICS
auto slz = GetSourceLocationZones( zone->SrcLoc() );
auto& ztd = slz->zones.push_next();
ztd.SetZone( zone );
ztd.SetThread( CompressThread( v.tid ) );
#else
CountZoneStatistics( zone );
#endif
} }
} }
@ -1565,11 +1574,8 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
auto& vec = *(Vector<ZoneEvent>*)( &_vec ); auto& vec = *(Vector<ZoneEvent>*)( &_vec );
for( auto& zone : vec ) for( auto& zone : vec )
{ {
ReconstructZoneStatistics( zone, thread ); if( zone.IsEndValid() ) ReconstructZoneStatistics( zone, thread );
if( zone.Child() >= 0 ) if( zone.Child() >= 0 ) ProcessTimeline( GetZoneChildrenMutable( zone.Child() ), thread );
{
ProcessTimeline( GetZoneChildrenMutable( zone.Child() ), thread );
}
} }
}; };
@ -2665,15 +2671,6 @@ void Worker::NewZone( ZoneEvent* zone, uint64_t thread )
{ {
m_data.zonesCnt++; m_data.zonesCnt++;
#ifndef TRACY_NO_STATISTICS
auto slz = GetSourceLocationZones( zone->SrcLoc() );
auto& ztd = slz->zones.push_next();
ztd.SetZone( zone );
ztd.SetThread( CompressThread( thread ) );
#else
CountZoneStatistics( zone );
#endif
auto td = m_threadCtxData; auto td = m_threadCtxData;
if( !td ) td = m_threadCtxData = NoticeThread( thread ); if( !td ) td = m_threadCtxData = NoticeThread( thread );
td->count++; td->count++;
@ -3538,6 +3535,9 @@ void Worker::ProcessZoneEnd( const QueueZoneEnd& ev )
if( timeSpan > 0 ) if( timeSpan > 0 )
{ {
auto slz = GetSourceLocationZones( zone->SrcLoc() ); auto slz = GetSourceLocationZones( zone->SrcLoc() );
auto& ztd = slz->zones.push_next();
ztd.SetZone( zone );
ztd.SetThread( CompressThread( m_threadCtx ) );
if( slz->min > timeSpan ) slz->min = timeSpan; if( slz->min > timeSpan ) slz->min = timeSpan;
if( slz->max < timeSpan ) slz->max = timeSpan; if( slz->max < timeSpan ) slz->max = timeSpan;
slz->total += timeSpan; slz->total += timeSpan;
@ -3555,6 +3555,8 @@ void Worker::ProcessZoneEnd( const QueueZoneEnd& ev )
{ {
td->childTimeStack.pop_back(); td->childTimeStack.pop_back();
} }
#else
CountZoneStatistics( zone );
#endif #endif
} }
@ -5049,37 +5051,34 @@ void Worker::ReadTimelinePre0510( FileRead& f, GpuEvent* zone, int64_t& refTime,
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
void Worker::ReconstructZoneStatistics( ZoneEvent& zone, uint16_t thread ) void Worker::ReconstructZoneStatistics( ZoneEvent& zone, uint16_t thread )
{ {
auto it = m_data.sourceLocationZones.find( zone.SrcLoc() ); assert( zone.IsEndValid() );
assert( it != m_data.sourceLocationZones.end() ); auto timeSpan = zone.End() - zone.Start();
auto& slz = it->second; if( timeSpan > 0 )
auto& ztd = slz.zones.push_next();
ztd.SetZone( &zone );
ztd.SetThread( thread );
if( zone.IsEndValid() )
{ {
auto timeSpan = zone.End() - zone.Start(); auto it = m_data.sourceLocationZones.find( zone.SrcLoc() );
if( timeSpan > 0 ) assert( it != m_data.sourceLocationZones.end() );
auto& slz = it->second;
auto& ztd = slz.zones.push_next();
ztd.SetZone( &zone );
ztd.SetThread( thread );
if( slz.min > timeSpan ) slz.min = timeSpan;
if( slz.max < timeSpan ) slz.max = timeSpan;
slz.total += timeSpan;
slz.sumSq += double( timeSpan ) * timeSpan;
if( zone.Child() >= 0 )
{ {
if( slz.min > timeSpan ) slz.min = timeSpan; auto& children = GetZoneChildren( zone.Child() );
if( slz.max < timeSpan ) slz.max = timeSpan; assert( children.is_magic() );
slz.total += timeSpan; auto& c = *(Vector<ZoneEvent>*)( &children );
slz.sumSq += double( timeSpan ) * timeSpan; for( auto& v : c )
if( zone.Child() >= 0 )
{ {
auto& children = GetZoneChildren( zone.Child() ); const auto childSpan = std::max( int64_t( 0 ), v.End() - v.Start() );
assert( children.is_magic() ); timeSpan -= childSpan;
auto& c = *(Vector<ZoneEvent>*)( &children );
for( auto& v : c )
{
const auto childSpan = std::max( int64_t( 0 ), v.End() - v.Start() );
timeSpan -= childSpan;
}
} }
if( slz.selfMin > timeSpan ) slz.selfMin = timeSpan;
if( slz.selfMax < timeSpan ) slz.selfMax = timeSpan;
slz.selfTotal += timeSpan;
} }
if( slz.selfMin > timeSpan ) slz.selfMin = timeSpan;
if( slz.selfMax < timeSpan ) slz.selfMax = timeSpan;
slz.selfTotal += timeSpan;
} }
} }
#else #else