diff options
| author | Bartosz Taudul <wolf.pld@gmail.com> | 2019-08-16 01:24:29 +0300 |
|---|---|---|
| committer | Bartosz Taudul <wolf.pld@gmail.com> | 2019-08-16 01:24:29 +0300 |
| commit | 42c71d7e4665b0c4f7a8b89720fc99921575ad6d (patch) | |
| tree | 6407c25f0294fe8b445345d66fd8bacba073f96d /server/TracyWorker.cpp | |
| parent | 95879d2bd942fea135e6b6e49b9e031ab77b2401 (diff) | |
Fix loading old traces.
Diffstat (limited to 'server/TracyWorker.cpp')
| -rw-r--r-- | server/TracyWorker.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index ed877267..8766002d 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -1074,7 +1074,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) } else if( fileVer >= FileVersion( 0, 4, 4 ) ) { - refTime = -m_data.baseTime; auto& frees = m_data.memory.frees; auto& active = m_data.memory.active; @@ -1088,10 +1087,10 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) uint16_t threadAlloc, threadFree; f.Read2( threadAlloc, threadFree ); refTime += timeAlloc; - mem->SetTimeAlloc( refTime ); + mem->SetTimeAlloc( refTime - m_data.baseTime ); if( timeFree >= 0 ) { - mem->SetTimeFree( timeFree + refTime ); + mem->SetTimeFree( timeFree + refTime - m_data.baseTime ); frees[fidx++] = i; } else @@ -1106,7 +1105,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) } else { - refTime = -m_data.baseTime; for( uint64_t i=0; i<sz; i++ ) { s_loadProgress.subProgress.store( i, std::memory_order_relaxed ); @@ -1116,13 +1114,11 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) int64_t timeAlloc, timeFree; f.Read2( timeAlloc, timeFree ); f.Read( &mem->csAlloc, sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) ); - uint16_t threadAlloc, threadFree; - f.Read2( threadAlloc, threadFree ); refTime += timeAlloc; - mem->SetTimeAlloc( refTime ); + mem->SetTimeAlloc( refTime - m_data.baseTime ); if( timeFree >= 0 ) { - mem->SetTimeFree( timeFree + refTime ); + mem->SetTimeFree( timeFree + refTime - m_data.baseTime ); } else { @@ -1135,8 +1131,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) int64_t timeAlloc, timeFree; f.Read2( timeAlloc, timeFree ); f.Read( &mem->csAlloc, sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) ); - uint16_t threadAlloc, threadFree; - f.Read2( threadAlloc, threadFree ); mem->SetTimeAlloc( timeAlloc - m_data.baseTime ); if( timeFree >= 0 ) { |