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

Load zone child number along with zone data.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-02-12 02:14:21 +01:00
parent 925909aa3a
commit e88df069bd
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/TracyWorker.cpp
View File

@ -5047,6 +5047,11 @@ void Worker::ReadTimeline( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32
{ {
uint32_t sz; uint32_t sz;
f.Read( sz ); f.Read( sz );
ReadTimelineHaveSize( f, zone, refTime, childIdx, sz );
}
void Worker::ReadTimelineHaveSize( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32_t& childIdx, uint32_t sz )
{
if( sz == 0 ) if( sz == 0 )
{ {
zone->SetChild( -1 ); zone->SetChild( -1 );
@ -5093,6 +5098,11 @@ void Worker::ReadTimeline( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_
{ {
uint64_t sz; uint64_t sz;
f.Read( sz ); f.Read( sz );
ReadTimelineHaveSize( f, zone, refTime, refGpuTime, childIdx, sz );
}
void Worker::ReadTimelineHaveSize( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_t& refGpuTime, int32_t& childIdx, uint64_t sz )
{
if( sz == 0 ) if( sz == 0 )
{ {
zone->SetChild( -1 ); zone->SetChild( -1 );
@ -5181,11 +5191,12 @@ void Worker::ReadTimeline( FileRead& f, Vector<short_ptr<ZoneEvent>>& _vec, uint
s_loadProgress.subProgress.store( lp + 1, std::memory_order_relaxed ); s_loadProgress.subProgress.store( lp + 1, std::memory_order_relaxed );
int16_t srcloc; int16_t srcloc;
int64_t tstart; int64_t tstart;
f.Read3( srcloc, tstart, zone->extra ); uint32_t childSz;
f.Read4( srcloc, tstart, zone->extra, childSz );
zone->SetSrcLoc( srcloc ); zone->SetSrcLoc( srcloc );
refTime += tstart; refTime += tstart;
zone->SetStart( refTime ); zone->SetStart( refTime );
ReadTimeline( f, zone, refTime, childIdx ); ReadTimelineHaveSize( f, zone, refTime, childIdx, childSz );
zone->SetEnd( ReadTimeOffset( f, refTime ) ); zone->SetEnd( ReadTimeOffset( f, refTime ) );
#ifdef TRACY_NO_STATISTICS #ifdef TRACY_NO_STATISTICS
CountZoneStatistics( zone ); CountZoneStatistics( zone );
@ -5301,7 +5312,8 @@ void Worker::ReadTimeline( FileRead& f, Vector<short_ptr<GpuEvent>>& _vec, uint6
int64_t tcpu, tgpu; int64_t tcpu, tgpu;
int16_t srcloc; int16_t srcloc;
uint16_t thread; uint16_t thread;
f.Read5( tcpu, tgpu, srcloc, zone->callstack, thread ); uint64_t childSz;
f.Read6( tcpu, tgpu, srcloc, zone->callstack, thread, childSz );
zone->SetSrcLoc( srcloc ); zone->SetSrcLoc( srcloc );
zone->SetThread( thread ); zone->SetThread( thread );
refTime += tcpu; refTime += tcpu;
@ -5309,7 +5321,7 @@ void Worker::ReadTimeline( FileRead& f, Vector<short_ptr<GpuEvent>>& _vec, uint6
zone->SetCpuStart( refTime ); zone->SetCpuStart( refTime );
zone->SetGpuStart( refGpuTime ); zone->SetGpuStart( refGpuTime );
ReadTimeline( f, zone, refTime, refGpuTime, childIdx ); ReadTimelineHaveSize( f, zone, refTime, refGpuTime, childIdx, childSz );
f.Read2( tcpu, tgpu ); f.Read2( tcpu, tgpu );
refTime += tcpu; refTime += tcpu;

2
server/TracyWorker.hpp
View File

@ -617,8 +617,10 @@ private:
#endif #endif
tracy_force_inline void ReadTimeline( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32_t& childIdx ); tracy_force_inline void ReadTimeline( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32_t& childIdx );
tracy_force_inline void ReadTimelineHaveSize( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32_t& childIdx, uint32_t sz );
tracy_force_inline void ReadTimelinePre063( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32_t& childIdx, int fileVer ); tracy_force_inline void ReadTimelinePre063( FileRead& f, ZoneEvent* zone, int64_t& refTime, int32_t& childIdx, int fileVer );
tracy_force_inline void ReadTimeline( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_t& refGpuTime, int32_t& childIdx ); tracy_force_inline void ReadTimeline( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_t& refGpuTime, int32_t& childIdx );
tracy_force_inline void ReadTimelineHaveSize( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_t& refGpuTime, int32_t& childIdx, uint64_t sz );
tracy_force_inline void ReadTimelinePre0510( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_t& refGpuTime, int fileVer ); tracy_force_inline void ReadTimelinePre0510( FileRead& f, GpuEvent* zone, int64_t& refTime, int64_t& refGpuTime, int fileVer );
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS