zhangengru/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

Fiber name transport.

Browse Source
This commit is contained in:
Bartosz Taudul
2021-11-03 18:57:30 +01:00
parent 211b202d8e
commit fceb065329
5 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyWorker.cpp
+34 -2
View File
@@ -266,6 +266,7 @@ Worker::Worker( const char* addr, uint16_t port )
, m_inconsistentSamples( false )
, m_pendingStrings( 0 )
, m_pendingThreads( 0 )
, m_pendingFibers( 0 )
, m_pendingExternalNames( 0 )
, m_pendingSourceLocation( 0 )
, m_pendingCallstackFrames( 0 )
@@ -3084,7 +3085,7 @@ void Worker::Exec()
m_pendingCallstackSubframes != 0 || m_pendingFrameImageData.image != nullptr || !m_pendingSymbols.empty() ||
!m_pendingSymbolCode.empty() || m_pendingCodeInformation != 0 || !m_serverQueryQueue.empty() ||
m_pendingSourceLocationPayload != 0 || m_pendingSingleString.ptr != nullptr || m_pendingSecondString.ptr != nullptr ||
!m_sourceCodeQuery.empty() )
!m_sourceCodeQuery.empty() || m_pendingFibers != 0 )
{
continue;
}
@@ -3243,6 +3244,10 @@ void Worker::DispatchFailure( const QueueItem& ev, const char*& ptr )
AddThreadString( ev.stringTransfer.ptr, ptr, sz );
m_serverQuerySpaceLeft++;
break;
case QueueType::FiberName:
AddFiberName( ev.stringTransfer.ptr, ptr, sz );
m_serverQuerySpaceLeft++;
break;
case QueueType::PlotName:
case QueueType::FrameName:
case QueueType::ExternalName:
@@ -3406,6 +3411,10 @@ bool Worker::DispatchProcess( const QueueItem& ev, const char*& ptr )
AddThreadString( ev.stringTransfer.ptr, ptr, sz );
m_serverQuerySpaceLeft++;
break;
case QueueType::FiberName:
AddFiberName( ev.stringTransfer.ptr, ptr, sz );
m_serverQuerySpaceLeft++;
break;
case QueueType::PlotName:
HandlePlotName( ev.stringTransfer.ptr, ptr, sz );
m_serverQuerySpaceLeft++;
@@ -3570,6 +3579,7 @@ ThreadData* Worker::NoticeThreadReal( uint64_t thread )
}
else
{
CheckThreadString( thread );
return NewThread( thread, false );
}
}
@@ -3646,7 +3656,6 @@ const MemData& Worker::GetMemoryNamed( uint64_t name ) const
ThreadData* Worker::NewThread( uint64_t thread, bool fiber )
{
if( !fiber ) CheckThreadString( thread );
auto td = m_slab.AllocInit<ThreadData>();
td->id = thread;
td->count = 0;
@@ -3769,6 +3778,16 @@ void Worker::CheckThreadString( uint64_t id )
if( m_sock.IsValid() ) Query( ServerQueryThreadString, id );
}
void Worker::CheckFiberName( uint64_t id, uint64_t tid )
{
if( m_data.threadNames.find( tid ) != m_data.threadNames.end() ) return;
m_data.threadNames.emplace( tid, "???" );
m_pendingFibers++;
if( m_sock.IsValid() ) Query( ServerQueryFiberName, id );
}
void Worker::CheckExternalName( uint64_t id )
{
if( m_data.externalNames.find( id ) != m_data.externalNames.end() ) return;
@@ -3895,6 +3914,18 @@ void Worker::AddThreadString( uint64_t id, const char* str, size_t sz )
it->second = sl.ptr;
}
void Worker::AddFiberName( uint64_t id, const char* str, size_t sz )
{
assert( m_pendingFibers > 0 );
m_pendingFibers--;
auto it = m_data.fiberToThreadMap.find( id );
assert( it != m_data.fiberToThreadMap.end() );
auto tit = m_data.threadNames.find( it->second );
assert( tit != m_data.threadNames.end() && strcmp( tit->second, "???" ) == 0 );
const auto sl = StoreString( str, sz );
tit->second = sl.ptr;
}
void Worker::AddSingleString( const char* str, size_t sz )
{
assert( m_pendingSingleString.ptr == nullptr );
@@ -6725,6 +6756,7 @@ void Worker::ProcessFiberEnter( const QueueFiberEnter& ev )
tid = ( uint64_t(1) << 32 ) | m_data.fiberToThreadMap.size();
m_data.fiberToThreadMap.emplace( ev.fiber, tid );
NewThread( tid, true );
CheckFiberName( ev.fiber, tid );
}
else
{