From e3dfa960551e6190346e205c869ca4ed696c9623 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 26 Jul 2020 00:35:41 +0200 Subject: [PATCH] Extract single string idx retrieval. --- server/TracyWorker.cpp | 16 ++++++++++------ server/TracyWorker.hpp | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index af3614d9..5f0abbca 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -3826,6 +3826,14 @@ void Worker::HandlePostponedGhostZones() } #endif +uint32_t Worker::GetSingleStringIdx() +{ + assert( m_pendingSingleString.ptr != nullptr ); + const auto idx = m_pendingSingleString.idx; + m_pendingSingleString.ptr = nullptr; + return idx; +} + StringLocation Worker::StoreString( const char* str, size_t sz ) { StringLocation ret; @@ -5503,9 +5511,7 @@ void Worker::ProcessSymbolInformation( const QueueSymbolInformation& ev ) auto it = m_pendingSymbols.find( ev.symAddr ); assert( it != m_pendingSymbols.end() ); - assert( m_pendingSingleString.ptr != nullptr ); - const auto idx = m_pendingSingleString.idx; - m_pendingSingleString.ptr = nullptr; + const auto idx = GetSingleStringIdx(); SymbolData sd; sd.name = it->second.name; @@ -5548,9 +5554,7 @@ void Worker::ProcessCodeInformation( const QueueCodeInformation& ev ) assert( m_pendingCodeInformation > 0 ); m_pendingCodeInformation--; - assert( m_pendingSingleString.ptr != nullptr ); - const auto idx = m_pendingSingleString.idx; - m_pendingSingleString.ptr = nullptr; + const auto idx = GetSingleStringIdx(); if( ev.line != 0 ) { diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp index 9c93a984..9108814b 100644 --- a/server/TracyWorker.hpp +++ b/server/TracyWorker.hpp @@ -761,6 +761,7 @@ private: void HandleFailure( const char* ptr, const char* end ); void DispatchFailure( const QueueItem& ev, const char*& ptr ); + uint32_t GetSingleStringIdx(); StringLocation StoreString( const char* str, size_t sz ); const ContextSwitch* const GetContextSwitchDataImpl( uint64_t thread );