mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Messages are inserted for current thread context.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-10 17:23:04 +01:00
parent 003bed573c
commit d4a1168491
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/TracyWorker.cpp
View File

@ -2725,7 +2725,7 @@ int16_t Worker::NewShrinkedSourceLocation( uint64_t srcloc )
return sz; return sz;
} }
void Worker::InsertMessageData( MessageData* msg, uint64_t thread ) void Worker::InsertMessageData( MessageData* msg )
{ {
if( m_data.messages.empty() ) if( m_data.messages.empty() )
{ {
@ -2741,7 +2741,9 @@ void Worker::InsertMessageData( MessageData* msg, uint64_t thread )
m_data.messages.insert( mit, msg ); m_data.messages.insert( mit, msg );
} }
auto vec = &NoticeThread( thread )->messages; auto td = m_threadCtxData;
if( !td ) td = m_threadCtxData = NoticeThread( m_threadCtx );
auto vec = &td->messages;
if( vec->empty() ) if( vec->empty() )
{ {
vec->push_back( msg ); vec->push_back( msg );
@ -4144,7 +4146,7 @@ void Worker::ProcessMessage( const QueueMessage& ev )
msg->thread = CompressThread( m_threadCtx ); msg->thread = CompressThread( m_threadCtx );
msg->color = 0xFFFFFFFF; msg->color = 0xFFFFFFFF;
if( m_data.lastTime < time ) m_data.lastTime = time; if( m_data.lastTime < time ) m_data.lastTime = time;
InsertMessageData( msg, m_threadCtx ); InsertMessageData( msg );
m_pendingCustomStrings.erase( it ); m_pendingCustomStrings.erase( it );
} }
@ -4158,7 +4160,7 @@ void Worker::ProcessMessageLiteral( const QueueMessage& ev )
msg->thread = CompressThread( m_threadCtx ); msg->thread = CompressThread( m_threadCtx );
msg->color = 0xFFFFFFFF; msg->color = 0xFFFFFFFF;
if( m_data.lastTime < time ) m_data.lastTime = time; if( m_data.lastTime < time ) m_data.lastTime = time;
InsertMessageData( msg, m_threadCtx ); InsertMessageData( msg );
} }
void Worker::ProcessMessageColor( const QueueMessageColor& ev ) void Worker::ProcessMessageColor( const QueueMessageColor& ev )
@ -4172,7 +4174,7 @@ void Worker::ProcessMessageColor( const QueueMessageColor& ev )
msg->thread = CompressThread( m_threadCtx ); msg->thread = CompressThread( m_threadCtx );
msg->color = 0xFF000000 | ( ev.r << 16 ) | ( ev.g << 8 ) | ev.b; msg->color = 0xFF000000 | ( ev.r << 16 ) | ( ev.g << 8 ) | ev.b;
if( m_data.lastTime < time ) m_data.lastTime = time; if( m_data.lastTime < time ) m_data.lastTime = time;
InsertMessageData( msg, m_threadCtx ); InsertMessageData( msg );
m_pendingCustomStrings.erase( it ); m_pendingCustomStrings.erase( it );
} }
@ -4186,7 +4188,7 @@ void Worker::ProcessMessageLiteralColor( const QueueMessageColor& ev )
msg->thread = CompressThread( m_threadCtx ); msg->thread = CompressThread( m_threadCtx );
msg->color = 0xFF000000 | ( ev.r << 16 ) | ( ev.g << 8 ) | ev.b; msg->color = 0xFF000000 | ( ev.r << 16 ) | ( ev.g << 8 ) | ev.b;
if( m_data.lastTime < time ) m_data.lastTime = time; if( m_data.lastTime < time ) m_data.lastTime = time;
InsertMessageData( msg, m_threadCtx ); InsertMessageData( msg );
} }
void Worker::ProcessMessageAppInfo( const QueueMessage& ev ) void Worker::ProcessMessageAppInfo( const QueueMessage& ev )

2
server/TracyWorker.hpp
View File

@ -501,7 +501,7 @@ private:
void CreateMemAllocPlot(); void CreateMemAllocPlot();
void ReconstructMemAllocPlot(); void ReconstructMemAllocPlot();
void InsertMessageData( MessageData* msg, uint64_t thread ); void InsertMessageData( MessageData* msg );
ThreadData* NoticeThreadReal( uint64_t thread ); ThreadData* NoticeThreadReal( uint64_t thread );
ThreadData* NewThread( uint64_t thread ); ThreadData* NewThread( uint64_t thread );