diff --git a/public/common/TracyVersion.hpp b/public/common/TracyVersion.hpp index aa4f9336..0905ef94 100644 --- a/public/common/TracyVersion.hpp +++ b/public/common/TracyVersion.hpp @@ -7,7 +7,7 @@ namespace Version { enum { Major = 0 }; enum { Minor = 11 }; -enum { Patch = 0 }; +enum { Patch = 1 }; } } diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 0a0ae99e..7b9ad7d2 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -984,7 +984,15 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks, bool allow { auto td = m_slab.AllocInit(); uint64_t tid; - f.Read4( tid, td->count, td->kernelSampleCnt, td->isFiber ); + if( fileVer >= FileVersion( 0, 11, 1 ) ) + { + f.Read5( tid, td->count, td->kernelSampleCnt, td->isFiber, td->groupHint ); + } + else + { + f.Read4( tid, td->count, td->kernelSampleCnt, td->isFiber ); + td->groupHint = 0; + } td->id = tid; m_data.zonesCnt += td->count; uint32_t tsz; @@ -1054,7 +1062,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks, bool allow f.Skip( ssz * ( 8 + 3 ) ); } } - td->groupHint = 0; m_data.threads[i] = td; m_threadMap.emplace( tid, td ); } @@ -7904,6 +7911,7 @@ void Worker::Write( FileWrite& f, bool fiDict ) f.Write( &thread->count, sizeof( thread->count ) ); f.Write( &thread->kernelSampleCnt, sizeof( thread->kernelSampleCnt ) ); f.Write( &thread->isFiber, sizeof( thread->isFiber ) ); + f.Write( &thread->groupHint, sizeof( thread->groupHint ) ); WriteTimeline( f, thread->timeline, refTime ); sz = thread->messages.size(); f.Write( &sz, sizeof( sz ) );