Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Store thread id in MessageData.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-05-25 21:10:22 +02:00
parent bb0246730f
commit 53aea660c8
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/TracyEvent.hpp
View File

@ -162,6 +162,7 @@ struct MessageData
{ {
int64_t time; int64_t time;
StringRef ref; StringRef ref;
uint64_t thread;
}; };
struct ThreadData struct ThreadData

12
server/TracyWorker.cpp
View File

@ -443,9 +443,11 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
auto td = m_slab.AllocInit<ThreadData>(); auto td = m_slab.AllocInit<ThreadData>();
f.Read( td->id ); uint64_t tid;
f.Read( tid );
td->id = tid;
f.Read( td->count ); f.Read( td->count );
ReadTimeline( f, td->timeline, CompressThread( td->id ) ); ReadTimeline( f, td->timeline, CompressThread( tid ) );
uint64_t msz; uint64_t msz;
f.Read( msz ); f.Read( msz );
if( eventMask & EventType::Messages ) if( eventMask & EventType::Messages )
@ -455,7 +457,9 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
{ {
uint64_t ptr; uint64_t ptr;
f.Read( ptr ); f.Read( ptr );
td->messages.push_back_no_space_check( msgMap[ptr] ); auto md = msgMap[ptr];
td->messages.push_back_no_space_check( md );
md->thread = tid;
} }
} }
else else
@ -1726,6 +1730,7 @@ void Worker::ProcessMessage( const QueueMessage& ev )
auto msg = m_slab.Alloc<MessageData>(); auto msg = m_slab.Alloc<MessageData>();
msg->time = TscTime( ev.time ); msg->time = TscTime( ev.time );
msg->ref = StringRef( StringRef::Type::Idx, it->second.idx ); msg->ref = StringRef( StringRef::Type::Idx, it->second.idx );
msg->thread = ev.thread;
m_data.lastTime = std::max( m_data.lastTime, msg->time ); m_data.lastTime = std::max( m_data.lastTime, msg->time );
InsertMessageData( msg, ev.thread ); InsertMessageData( msg, ev.thread );
m_pendingCustomStrings.erase( it ); m_pendingCustomStrings.erase( it );
@ -1737,6 +1742,7 @@ void Worker::ProcessMessageLiteral( const QueueMessage& ev )
auto msg = m_slab.Alloc<MessageData>(); auto msg = m_slab.Alloc<MessageData>();
msg->time = TscTime( ev.time ); msg->time = TscTime( ev.time );
msg->ref = StringRef( StringRef::Type::Ptr, ev.text ); msg->ref = StringRef( StringRef::Type::Ptr, ev.text );
msg->thread = ev.thread;
m_data.lastTime = std::max( m_data.lastTime, msg->time ); m_data.lastTime = std::max( m_data.lastTime, msg->time );
InsertMessageData( msg, ev.thread ); InsertMessageData( msg, ev.thread );
} }