From 9ee494c0f44591b4e40df7bbe92e4da85b6e3451 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 16 Feb 2019 22:48:29 +0100 Subject: [PATCH] Store thread compression layout in trace dump. --- server/TracyVersion.hpp | 2 +- server/TracyWorker.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/TracyVersion.hpp b/server/TracyVersion.hpp index 92ec98d6..6e433754 100644 --- a/server/TracyVersion.hpp +++ b/server/TracyVersion.hpp @@ -7,7 +7,7 @@ namespace Version { enum { Major = 0 }; enum { Minor = 4 }; -enum { Patch = 3 }; +enum { Patch = 4 }; } } diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 57c8c200..f86b68d4 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -449,7 +449,13 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) } } - if( fileVer >= FileVersion( 0, 3, 201 ) ) + if( fileVer >= FileVersion( 0, 4, 4 ) ) + { + f.Read( sz ); + m_data.threadExpand.reserve_and_use( sz ); + f.Read( m_data.threadExpand.data(), sizeof( uint64_t ) * sz ); + } + else if( fileVer >= FileVersion( 0, 3, 201 ) ) { f.Read( sz ); m_data.threadExpand.reserve( sz ); @@ -3529,6 +3535,7 @@ void Worker::Write( FileWrite& f ) sz = m_data.threadExpand.size(); f.Write( &sz, sizeof( sz ) ); + f.Write( m_data.threadExpand.data(), sz * sizeof( uint64_t ) ); sz = m_data.sourceLocation.size(); f.Write( &sz, sizeof( sz ) );