mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for transfer of pending callback frames.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-06-20 14:57:48 +02:00
parent 60395c85e0
commit 7912807133
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/TracyWorker.cpp
View File

@ -187,6 +187,7 @@ Worker::Worker( const char* addr )
, m_pendingStrings( 0 ) , m_pendingStrings( 0 )
, m_pendingThreads( 0 ) , m_pendingThreads( 0 )
, m_pendingSourceLocation( 0 ) , m_pendingSourceLocation( 0 )
, m_pendingCallbackFrames( 0 )
{ {
m_data.sourceLocationExpand.push_back( 0 ); m_data.sourceLocationExpand.push_back( 0 );
m_data.threadExpand.push_back( 0 ); m_data.threadExpand.push_back( 0 );
@ -995,7 +996,7 @@ void Worker::Exec()
if( m_terminate ) if( m_terminate )
{ {
if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || m_pendingCallbackFrames != 0 ||
!m_pendingCustomStrings.empty() || !m_pendingPlots.empty() || !m_pendingCallstacks.empty() ) !m_pendingCustomStrings.empty() || !m_pendingPlots.empty() || !m_pendingCallstacks.empty() )
{ {
continue; continue;
@ -1365,6 +1366,7 @@ void Worker::AddCallstackPayload( uint64_t ptr, char* _data, size_t sz )
auto fit = m_data.callstackFrameMap.find( frame ); auto fit = m_data.callstackFrameMap.find( frame );
if( fit == m_data.callstackFrameMap.end() ) if( fit == m_data.callstackFrameMap.end() )
{ {
m_pendingCallbackFrames++;
ServerQuery( ServerQueryCallstackFrame, frame ); ServerQuery( ServerQueryCallstackFrame, frame );
} }
} }
@ -2128,6 +2130,9 @@ void Worker::ProcessCallstackMemory( const QueueCallstackMemory& ev )
void Worker::ProcessCallstackFrame( const QueueCallstackFrame& ev ) void Worker::ProcessCallstackFrame( const QueueCallstackFrame& ev )
{ {
assert( m_pendingCallbackFrames > 0 );
m_pendingCallbackFrames--;
auto fmit = m_data.callstackFrameMap.find( ev.ptr ); auto fmit = m_data.callstackFrameMap.find( ev.ptr );
auto nit = m_pendingCustomStrings.find( ev.name ); auto nit = m_pendingCustomStrings.find( ev.name );
assert( nit != m_pendingCustomStrings.end() ); assert( nit != m_pendingCustomStrings.end() );

1
server/TracyWorker.hpp
View File

@ -310,6 +310,7 @@ private:
uint32_t m_pendingStrings; uint32_t m_pendingStrings;
uint32_t m_pendingThreads; uint32_t m_pendingThreads;
uint32_t m_pendingSourceLocation; uint32_t m_pendingSourceLocation;
uint32_t m_pendingCallbackFrames;
uint64_t m_lastMemActionCallstack; uint64_t m_lastMemActionCallstack;
bool m_lastMemActionWasAlloc; bool m_lastMemActionWasAlloc;