diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 59fa62ae..eb490c18 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -187,7 +187,7 @@ Worker::Worker( const char* addr ) , m_pendingStrings( 0 ) , m_pendingThreads( 0 ) , m_pendingSourceLocation( 0 ) - , m_pendingCallbackFrames( 0 ) + , m_pendingCallstackFrames( 0 ) { m_data.sourceLocationExpand.push_back( 0 ); m_data.threadExpand.push_back( 0 ); @@ -996,7 +996,7 @@ void Worker::Exec() if( m_terminate ) { - if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || m_pendingCallbackFrames != 0 || + if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || m_pendingCallstackFrames != 0 || !m_pendingCustomStrings.empty() || !m_pendingPlots.empty() || !m_pendingCallstacks.empty() ) { continue; @@ -1366,7 +1366,7 @@ void Worker::AddCallstackPayload( uint64_t ptr, char* _data, size_t sz ) auto fit = m_data.callstackFrameMap.find( frame ); if( fit == m_data.callstackFrameMap.end() ) { - m_pendingCallbackFrames++; + m_pendingCallstackFrames++; ServerQuery( ServerQueryCallstackFrame, frame ); } } @@ -2130,8 +2130,8 @@ void Worker::ProcessCallstackMemory( const QueueCallstackMemory& ev ) void Worker::ProcessCallstackFrame( const QueueCallstackFrame& ev ) { - assert( m_pendingCallbackFrames > 0 ); - m_pendingCallbackFrames--; + assert( m_pendingCallstackFrames > 0 ); + m_pendingCallstackFrames--; auto fmit = m_data.callstackFrameMap.find( ev.ptr ); auto nit = m_pendingCustomStrings.find( ev.name ); diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp index 883c19ff..d8f19e82 100644 --- a/server/TracyWorker.hpp +++ b/server/TracyWorker.hpp @@ -310,7 +310,7 @@ private: uint32_t m_pendingStrings; uint32_t m_pendingThreads; uint32_t m_pendingSourceLocation; - uint32_t m_pendingCallbackFrames; + uint32_t m_pendingCallstackFrames; uint64_t m_lastMemActionCallstack; bool m_lastMemActionWasAlloc;