From 1e3476cf3633453166542bb059b6b4c6bbc326a3 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Tue, 17 Oct 2017 01:10:38 +0200 Subject: [PATCH] Transfer profiler initialization time. --- client/TracyProfiler.cpp | 3 ++- common/TracyProtocol.hpp | 3 ++- server/TracyView.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index b9ce909b..8e97f7ed 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -180,7 +180,8 @@ void Profiler::Worker() welcome.lz4 = 1; #endif welcome.timerMul = m_timerMul; - welcome.timeBegin = m_timeBegin; + welcome.initBegin = s_initTime.val; + welcome.initEnd = m_timeBegin.load( std::memory_order_relaxed ); welcome.delay = m_delay; welcome.resolution = m_resolution; welcome.epoch = m_epoch; diff --git a/common/TracyProtocol.hpp b/common/TracyProtocol.hpp index c821040a..36999a62 100644 --- a/common/TracyProtocol.hpp +++ b/common/TracyProtocol.hpp @@ -34,7 +34,8 @@ struct WelcomeMessage { uint8_t lz4; double timerMul; - uint64_t timeBegin; + uint64_t initBegin; + uint64_t initEnd; uint64_t delay; uint64_t resolution; uint64_t epoch; diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 6df9297a..ceed5f66 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -312,7 +312,8 @@ void View::Worker() if( !m_sock.Read( &welcome, sizeof( welcome ), &tv, ShouldExit ) ) goto close; lz4 = welcome.lz4; m_timerMul = welcome.timerMul; - m_frames.push_back( welcome.timeBegin * m_timerMul ); + m_frames.push_back( welcome.initBegin * m_timerMul ); + m_frames.push_back( welcome.initEnd * m_timerMul ); m_delay = welcome.delay * m_timerMul; m_resolution = welcome.resolution * m_timerMul;