From aeedf7de2df4983b31ecdce138211e5f3baea9a6 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 24 Jul 2022 12:42:39 +0200 Subject: [PATCH] Save/load plot steps parameter. --- server/TracyVersion.hpp | 2 +- server/TracyWorker.cpp | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/server/TracyVersion.hpp b/server/TracyVersion.hpp index 486a71dc..65dd2ea5 100644 --- a/server/TracyVersion.hpp +++ b/server/TracyVersion.hpp @@ -7,7 +7,7 @@ namespace Version { enum { Major = 0 }; enum { Minor = 8 }; -enum { Patch = 2 }; +enum { Patch = 3 }; } } diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 21814511..7d181082 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -1097,7 +1097,29 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks ) { m_data.plots.Data().reserve( sz ); s_loadProgress.subTotal.store( sz, std::memory_order_relaxed ); - if( fileVer >= FileVersion( 0, 7, 10 ) ) + if( fileVer >= FileVersion( 0, 8, 3 ) ) + { + for( uint64_t i=0; i(); + uint64_t psz; + f.Read8( pd->type, pd->format, pd->showSteps, pd->name, pd->min, pd->max, pd->sum, psz ); + pd->data.reserve_exact( psz, m_slab ); + auto ptr = pd->data.data(); + int64_t refTime = 0; + for( uint64_t j=0; jval ); + refTime += t; + ptr->time = refTime; + ptr++; + } + m_data.plots.Data().push_back_no_space_check( pd ); + } + } + else if( fileVer >= FileVersion( 0, 7, 10 ) ) { for( uint64_t i=0; i= FileVersion( 0, 7, 10 ) ) + if( fileVer >= FileVersion( 0, 8, 3 ) ) + { + for( uint64_t i=0; i= FileVersion( 0, 7, 10 ) ) { for( uint64_t i=0; itype == PlotType::Memory ) continue; f.Write( &plot->type, sizeof( plot->type ) ); f.Write( &plot->format, sizeof( plot->format ) ); + f.Write( &plot->showSteps, sizeof( plot->showSteps ) ); f.Write( &plot->name, sizeof( plot->name ) ); f.Write( &plot->min, sizeof( plot->min ) ); f.Write( &plot->max, sizeof( plot->max ) );