mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 13:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading old traces.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-08-16 00:24:29 +02:00
parent 95879d2bd9
commit 42c71d7e46
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/TracyWorker.cpp
View File

@ -1074,7 +1074,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
else if( fileVer >= FileVersion( 0, 4, 4 ) ) else if( fileVer >= FileVersion( 0, 4, 4 ) )
{ {
refTime = -m_data.baseTime;
auto& frees = m_data.memory.frees; auto& frees = m_data.memory.frees;
auto& active = m_data.memory.active; auto& active = m_data.memory.active;
@ -1088,10 +1087,10 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
uint16_t threadAlloc, threadFree; uint16_t threadAlloc, threadFree;
f.Read2( threadAlloc, threadFree ); f.Read2( threadAlloc, threadFree );
refTime += timeAlloc; refTime += timeAlloc;
mem->SetTimeAlloc( refTime ); mem->SetTimeAlloc( refTime - m_data.baseTime );
if( timeFree >= 0 ) if( timeFree >= 0 )
{ {
mem->SetTimeFree( timeFree + refTime ); mem->SetTimeFree( timeFree + refTime - m_data.baseTime );
frees[fidx++] = i; frees[fidx++] = i;
} }
else else
@ -1106,7 +1105,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
else else
{ {
refTime = -m_data.baseTime;
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
s_loadProgress.subProgress.store( i, std::memory_order_relaxed ); s_loadProgress.subProgress.store( i, std::memory_order_relaxed );
@ -1116,13 +1114,11 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
int64_t timeAlloc, timeFree; int64_t timeAlloc, timeFree;
f.Read2( timeAlloc, timeFree ); f.Read2( timeAlloc, timeFree );
f.Read( &mem->csAlloc, sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) ); f.Read( &mem->csAlloc, sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) );
uint16_t threadAlloc, threadFree;
f.Read2( threadAlloc, threadFree );
refTime += timeAlloc; refTime += timeAlloc;
mem->SetTimeAlloc( refTime ); mem->SetTimeAlloc( refTime - m_data.baseTime );
if( timeFree >= 0 ) if( timeFree >= 0 )
{ {
mem->SetTimeFree( timeFree + refTime ); mem->SetTimeFree( timeFree + refTime - m_data.baseTime );
} }
else else
{ {
@ -1135,8 +1131,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
int64_t timeAlloc, timeFree; int64_t timeAlloc, timeFree;
f.Read2( timeAlloc, timeFree ); f.Read2( timeAlloc, timeFree );
f.Read( &mem->csAlloc, sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) ); f.Read( &mem->csAlloc, sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) );
uint16_t threadAlloc, threadFree;
f.Read2( threadAlloc, threadFree );
mem->SetTimeAlloc( timeAlloc - m_data.baseTime ); mem->SetTimeAlloc( timeAlloc - m_data.baseTime );
if( timeFree >= 0 ) if( timeFree >= 0 )
{ {