1
0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00

Properly skip memory event data.

This commit is contained in:
Bartosz Taudul 2018-06-19 21:54:12 +02:00
parent 4033d74479
commit 14b71e988b

View File

@ -594,13 +594,27 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
} }
else else
{ {
f.Skip( sz * ( if( fileVer <= FileVersion( 0, 3, 1 ) )
sizeof( MemEvent::ptr ) + {
sizeof( MemEvent::size ) + f.Skip( sz * (
sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::ptr ) +
sizeof( MemEvent::timeFree ) + sizeof( MemEvent::size ) +
sizeof( uint64_t ) + sizeof( MemEvent::timeAlloc ) +
sizeof( uint64_t ) ) ); sizeof( MemEvent::timeFree ) +
sizeof( uint64_t ) +
sizeof( uint64_t ) ) );
}
else
{
f.Skip( sz * (
sizeof( MemEvent::ptr ) +
sizeof( MemEvent::size ) +
sizeof( MemEvent::timeAlloc ) +
sizeof( MemEvent::timeFree ) +
sizeof( MemEvent::callstack ) +
sizeof( uint64_t ) +
sizeof( uint64_t ) ) );
}
f.Skip( sizeof( MemData::high ) + sizeof( MemData::low ) + sizeof( MemData::usage ) ); f.Skip( sizeof( MemData::high ) + sizeof( MemData::low ) + sizeof( MemData::usage ) );
} }
} }