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

Store per-source-location zone lists.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-03-18 02:05:33 +01:00
parent c5c81a73bc
commit 9830fa297e
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/TracyWorker.cpp
View File

@ -108,6 +108,7 @@ Worker::Worker( FileRead& f )
f.Read( &sz, sizeof( sz ) ); f.Read( &sz, sizeof( sz ) );
m_data.sourceLocationExpand.reserve_and_use( sz ); m_data.sourceLocationExpand.reserve_and_use( sz );
f.Read( m_data.sourceLocationExpand.data(), sizeof( uint64_t ) * sz ); f.Read( m_data.sourceLocationExpand.data(), sizeof( uint64_t ) * sz );
const auto sle = sz;
f.Read( &sz, sizeof( sz ) ); f.Read( &sz, sizeof( sz ) );
m_data.sourceLocationPayload.reserve( sz ); m_data.sourceLocationPayload.reserve( sz );
@ -119,6 +120,16 @@ Worker::Worker( FileRead& f )
m_data.sourceLocationPayloadMap.emplace( srcloc, uint32_t( i ) ); m_data.sourceLocationPayloadMap.emplace( srcloc, uint32_t( i ) );
} }
m_data.sourceLocationZones.reserve( sle + sz );
for( uint64_t i=1; i<sle; i++ )
{
m_data.sourceLocationZones.emplace( int32_t( i ), Vector<ZoneEvent*>() );
}
for( uint64_t i=0; i<sz; i++ )
{
m_data.sourceLocationZones.emplace( -int32_t( i + 1 ), Vector<ZoneEvent*>() );
}
f.Read( &sz, sizeof( sz ) ); f.Read( &sz, sizeof( sz ) );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
@ -599,6 +610,7 @@ uint32_t Worker::NewShrinkedSourceLocation( uint64_t srcloc )
{ {
const auto sz = m_data.sourceLocationExpand.size(); const auto sz = m_data.sourceLocationExpand.size();
m_data.sourceLocationExpand.push_back( srcloc ); m_data.sourceLocationExpand.push_back( srcloc );
m_data.sourceLocationZones.emplace( sz, Vector<ZoneEvent*>() );
m_sourceLocationShrink.emplace( srcloc, sz ); m_sourceLocationShrink.emplace( srcloc, sz );
return sz; return sz;
} }
@ -662,6 +674,11 @@ ThreadData* Worker::NewThread( uint64_t thread )
void Worker::NewZone( ZoneEvent* zone, uint64_t thread ) void Worker::NewZone( ZoneEvent* zone, uint64_t thread )
{ {
m_data.zonesCnt++; m_data.zonesCnt++;
auto it = m_data.sourceLocationZones.find( zone->srcloc );
assert( it != m_data.sourceLocationZones.end() );
it->second.push_back( zone );
auto td = NoticeThread( thread ); auto td = NoticeThread( thread );
td->count++; td->count++;
if( td->stack.empty() ) if( td->stack.empty() )
@ -926,6 +943,7 @@ void Worker::AddSourceLocationPayload( uint64_t ptr, char* data, size_t sz )
m_data.sourceLocationPayloadMap.emplace( slptr, idx ); m_data.sourceLocationPayloadMap.emplace( slptr, idx );
m_pendingSourceLocationPayload.emplace( ptr, -int32_t( idx + 1 ) ); m_pendingSourceLocationPayload.emplace( ptr, -int32_t( idx + 1 ) );
m_data.sourceLocationPayload.push_back( slptr ); m_data.sourceLocationPayload.push_back( slptr );
m_data.sourceLocationZones.emplace( -int32_t( idx + 1 ), Vector<ZoneEvent*>() );
} }
else else
{ {
@ -1578,6 +1596,10 @@ void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint64_t size )
vec.push_back_no_space_check( zone ); vec.push_back_no_space_check( zone );
f.Read( zone, sizeof( ZoneEvent ) - sizeof( ZoneEvent::child ) ); f.Read( zone, sizeof( ZoneEvent ) - sizeof( ZoneEvent::child ) );
auto it = m_data.sourceLocationZones.find( zone->srcloc );
assert( it != m_data.sourceLocationZones.end() );
it->second.push_back( zone );
ReadTimeline( f, zone->child ); ReadTimeline( f, zone->child );
} }
} }

1
server/TracyWorker.hpp
View File

@ -54,6 +54,7 @@ class Worker
Vector<SourceLocation*> sourceLocationPayload; Vector<SourceLocation*> sourceLocationPayload;
flat_hash_map<SourceLocation*, uint32_t, SourceLocationHasher, SourceLocationComparator> sourceLocationPayloadMap; flat_hash_map<SourceLocation*, uint32_t, SourceLocationHasher, SourceLocationComparator> sourceLocationPayloadMap;
Vector<uint64_t> sourceLocationExpand; Vector<uint64_t> sourceLocationExpand;
flat_hash_map<int32_t, Vector<ZoneEvent*>> sourceLocationZones;
std::map<uint32_t, LockMap> lockMap; std::map<uint32_t, LockMap> lockMap;
}; };