Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Fix skipping data when loading traces.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-08-30 01:16:42 +02:00
parent 217a3781e6
commit 1c0c6311ec
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/TracyWorker.cpp
View File

@ -781,11 +781,11 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
f.Read( tsz ); f.Read( tsz );
if( fileVer >= FileVersion( 0, 5, 2 ) ) if( fileVer >= FileVersion( 0, 5, 2 ) )
{ {
f.Skip( tsz * ( sizeof( LockEvent::_time_srcloc ) + sizeof( LockEvent::thread ) + sizeof( LockEvent::type ) ) ); f.Skip( tsz * ( sizeof( int64_t ) + sizeof( int16_t ) + sizeof( LockEvent::thread ) + sizeof( LockEvent::type ) ) );
} }
else else
{ {
f.Skip( tsz * ( sizeof( int64_t ) + sizeof( LockEvent::type ) + sizeof( int32_t ) + sizeof( LockEvent::thread ) ) ); f.Skip( tsz * ( sizeof( int64_t ) + sizeof( int32_t ) + sizeof( LockEvent::thread ) + sizeof( LockEvent::type ) ) );
} }
} }
} }
@ -1379,8 +1379,8 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
s_loadProgress.subProgress.store( i, std::memory_order_relaxed ); s_loadProgress.subProgress.store( i, std::memory_order_relaxed );
uint16_t w, h; uint16_t w, h;
f.Read2( w, h ); f.Read2( w, h );
const auto sz = w * h / 2; const auto fisz = w * h / 2;
f.Skip( sz + 1 ); f.Skip( fisz + sizeof( FrameImage::flip ) );
} }
} }
} }
@ -1439,7 +1439,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
f.Skip( sizeof( uint64_t ) ); f.Skip( sizeof( uint64_t ) );
uint64_t csz; uint64_t csz;
f.Read( csz ); f.Read( csz );
f.Skip( csz * sizeof( ContextSwitchData ) ); f.Skip( csz * ( sizeof( int64_t ) * 3 + sizeof( int8_t ) * 3 ) );
} }
} }
@ -1474,7 +1474,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
for( int i=0; i<256; i++ ) for( int i=0; i<256; i++ )
{ {
f.Read( sz ); f.Read( sz );
f.Skip( sizeof( uint64_t ) * 3 * sz ); f.Skip( sz * ( sizeof( int64_t ) * 2 + sizeof( uint16_t ) ) );
} }
} }