mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases Wiki Activity

Process call stack frames during failure dispatch.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-09-30 15:57:14 +02:00
parent 641649143c
commit 9d392d2c90
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/TracyWorker.cpp
View File

@ -2989,10 +2989,18 @@ void Worker::DispatchFailure( const QueueItem& ev, const char*& ptr )
switch( ev.hdr.type ) switch( ev.hdr.type )
{ {
case QueueType::SingleStringData: case QueueType::SingleStringData:
ptr += sizeof( QueueHeader );
memcpy( &sz, ptr, sizeof( sz ) );
ptr += sizeof( sz );
AddSingleStringFailure( ptr, sz );
ptr += sz;
break;
case QueueType::SecondStringData: case QueueType::SecondStringData:
ptr += sizeof( QueueHeader ); ptr += sizeof( QueueHeader );
memcpy( &sz, ptr, sizeof( sz ) ); memcpy( &sz, ptr, sizeof( sz ) );
ptr += sizeof( sz ) + sz; ptr += sizeof( sz );
AddSecondString( ptr, sz );
ptr += sz;
break; break;
default: default:
ptr += QueueDataSize[ev.hdr.idx]; ptr += QueueDataSize[ev.hdr.idx];
@ -3003,6 +3011,12 @@ void Worker::DispatchFailure( const QueueItem& ev, const char*& ptr )
m_serverQuerySpaceLeft++; m_serverQuerySpaceLeft++;
break; break;
case QueueType::CallstackFrameSize: case QueueType::CallstackFrameSize:
ProcessCallstackFrameSize( ev.callstackFrameSize );
m_serverQuerySpaceLeft++;
break;
case QueueType::CallstackFrame:
ProcessCallstackFrame( ev.callstackFrame, false );
break;
case QueueType::SymbolInformation: case QueueType::SymbolInformation:
case QueueType::ParamPingback: case QueueType::ParamPingback:
m_serverQuerySpaceLeft++; m_serverQuerySpaceLeft++;
@ -3542,6 +3556,13 @@ void Worker::AddSingleString( const char* str, size_t sz )
m_pendingSingleString = StoreString( str, sz ); m_pendingSingleString = StoreString( str, sz );
} }
void Worker::AddSingleStringFailure( const char* str, size_t sz )
{
// During failure dispatch processing of most events is ignored, but string data
// is still send. Just ignore anything that was already in the staging area.
m_pendingSingleString = StoreString( str, sz );
}
void Worker::AddSecondString( const char* str, size_t sz ) void Worker::AddSecondString( const char* str, size_t sz )
{ {
assert( m_pendingSecondString.ptr == nullptr ); assert( m_pendingSecondString.ptr == nullptr );

1
server/TracyWorker.hpp
View File

@ -736,6 +736,7 @@ private:
void AddString( uint64_t ptr, const char* str, size_t sz ); void AddString( uint64_t ptr, const char* str, size_t sz );
void AddThreadString( uint64_t id, const char* str, size_t sz ); void AddThreadString( uint64_t id, const char* str, size_t sz );
void AddSingleString( const char* str, size_t sz ); void AddSingleString( const char* str, size_t sz );
void AddSingleStringFailure( const char* str, size_t sz );
void AddSecondString( const char* str, size_t sz ); void AddSecondString( const char* str, size_t sz );
void AddExternalName( uint64_t ptr, const char* str, size_t sz ); void AddExternalName( uint64_t ptr, const char* str, size_t sz );
void AddExternalThreadName( uint64_t ptr, const char* str, size_t sz ); void AddExternalThreadName( uint64_t ptr, const char* str, size_t sz );