mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-06 07:03:52 +00:00
Code Issues Releases Wiki Activity

Preserve magic time values when loading old traces.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-08-15 21:30:37 +02:00
parent 41beff29a9
commit 8b73dece98
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/TracyWorker.cpp
View File

@ -886,7 +886,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
else if( fileVer <= FileVersion( 0, 5, 1 ) ) else if( fileVer <= FileVersion( 0, 5, 1 ) )
{ {
int64_t refTime = -m_data.baseTime; int64_t refTime = 0;
ReadTimelinePre052( f, td->timeline, CompressThread( tid ), tsz, refTime, fileVer ); ReadTimelinePre052( f, td->timeline, CompressThread( tid ), tsz, refTime, fileVer );
} }
else else
@ -945,8 +945,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
{ {
if( fileVer <= FileVersion( 0, 5, 1 ) ) if( fileVer <= FileVersion( 0, 5, 1 ) )
{ {
refTime = -m_data.baseTime;
refGpuTime = -m_data.baseTime;
ReadTimelinePre052( f, ctx->timeline, tsz, refTime, refGpuTime, fileVer ); ReadTimelinePre052( f, ctx->timeline, tsz, refTime, refGpuTime, fileVer );
} }
else else
@ -4239,10 +4237,9 @@ void Worker::ReadTimelinePre042( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t
vec[i] = zone; vec[i] = zone;
int64_t start; int64_t start;
f.Read( start ); f.Read( start );
start -= m_data.baseTime; zone->SetStart( start - m_data.baseTime );
zone->SetStart( start );
f.Read( zone->end ); f.Read( zone->end );
zone->end -= m_data.baseTime; if( zone->end >= 0 ) zone->end -= m_data.baseTime;
int16_t srcloc; int16_t srcloc;
f.Read( srcloc ); f.Read( srcloc );
zone->SetSrcLoc( srcloc ); zone->SetSrcLoc( srcloc );
@ -4286,9 +4283,10 @@ void Worker::ReadTimelinePre052( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t
} }
f.Read( &zone->text, sizeof( zone->text ) + sizeof( zone->callstack ) + sizeof( zone->name ) ); f.Read( &zone->text, sizeof( zone->text ) + sizeof( zone->callstack ) + sizeof( zone->name ) );
refTime += zone->end; refTime += zone->end;
zone->SetStart( refTime ); zone->SetStart( refTime - m_data.baseTime );
ReadTimelinePre052( f, zone, thread, refTime, fileVer ); ReadTimelinePre052( f, zone, thread, refTime, fileVer );
zone->end = ReadTimeOffset( f, refTime ); zone->end = ReadTimeOffset( f, refTime );
if( zone->end >= 0 ) zone->end -= m_data.baseTime;
#ifdef TRACY_NO_STATISTICS #ifdef TRACY_NO_STATISTICS
ReadTimelineUpdateStatistics( zone, thread ); ReadTimelineUpdateStatistics( zone, thread );
#endif #endif
@ -4367,8 +4365,9 @@ void Worker::ReadTimelinePre052( FileRead& f, Vector<GpuEvent*>& vec, uint64_t s
f.Read( zone->callstack ); f.Read( zone->callstack );
refTime += zone->gpuStart; refTime += zone->gpuStart;
refGpuTime += zone->gpuEnd; refGpuTime += zone->gpuEnd;
zone->cpuStart = refTime; zone->cpuStart = refTime - m_data.baseTime;
zone->gpuStart = refGpuTime; zone->gpuStart = refGpuTime;
if( zone->gpuStart != std::numeric_limits<int64_t>::max() ) zone->gpuStart -= m_data.baseTime;
uint64_t thread; uint64_t thread;
f.Read( thread ); f.Read( thread );
@ -4392,14 +4391,17 @@ void Worker::ReadTimelinePre052( FileRead& f, Vector<GpuEvent*>& vec, uint64_t s
f.Read( zone->thread ); f.Read( zone->thread );
refTime += zone->gpuStart; refTime += zone->gpuStart;
refGpuTime += zone->gpuEnd; refGpuTime += zone->gpuEnd;
zone->cpuStart = refTime; zone->cpuStart = refTime - m_data.baseTime;
zone->gpuStart = refGpuTime; zone->gpuStart = refGpuTime;
if( zone->gpuStart != std::numeric_limits<int64_t>::max() ) zone->gpuStart -= m_data.baseTime;
} }
ReadTimelinePre052( f, zone, refTime, refGpuTime, fileVer ); ReadTimelinePre052( f, zone, refTime, refGpuTime, fileVer );
if( fileVer > FileVersion( 0, 4, 1 ) ) if( fileVer > FileVersion( 0, 4, 1 ) )
{ {
zone->cpuEnd = ReadTimeOffset( f, refTime ); zone->cpuEnd = ReadTimeOffset( f, refTime );
zone->gpuEnd = ReadTimeOffset( f, refGpuTime ); zone->gpuEnd = ReadTimeOffset( f, refGpuTime );
if( zone->cpuEnd > 0 ) zone->cpuEnd -= m_data.baseTime;
if( zone->gpuEnd > 0 ) zone->gpuEnd -= m_data.baseTime;
} }
} }
} }