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

Use SortedVector for source location zones.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-02-07 19:35:53 +01:00
parent 0100d0beb4
commit 18e893752b
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/TracyWorker.cpp
View File

@ -374,10 +374,11 @@ Worker::Worker( const char* name, const char* program, const std::vector<ImportE
zone->SetEnd( v.timestamp ); zone->SetEnd( v.timestamp );
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
auto slz = GetSourceLocationZones( zone->SrcLoc() ); ZoneThreadData ztd;
auto& ztd = slz->zones.push_next();
ztd.SetZone( zone ); ztd.SetZone( zone );
ztd.SetThread( CompressThread( v.tid ) ); ztd.SetThread( CompressThread( v.tid ) );
auto slz = GetSourceLocationZones( zone->SrcLoc() );
slz->zones.push_back( ztd );
#else #else
CountZoneStatistics( zone ); CountZoneStatistics( zone );
#endif #endif
@ -1845,12 +1846,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
for( auto& v : m_data.sourceLocationZones ) for( auto& v : m_data.sourceLocationZones )
{ {
if( m_shutdown.load( std::memory_order_relaxed ) ) return; if( m_shutdown.load( std::memory_order_relaxed ) ) return;
auto& zones = v.second.zones; if( !v.second.zones.is_sorted() ) v.second.zones.sort();
#ifdef NO_PARALLEL_SORT
pdqsort_branchless( zones.begin(), zones.end(), []( const auto& lhs, const auto& rhs ) { return lhs.Zone()->Start() < rhs.Zone()->Start(); } );
#else
std::sort( std::execution::par_unseq, zones.begin(), zones.end(), []( const auto& lhs, const auto& rhs ) { return lhs.Zone()->Start() < rhs.Zone()->Start(); } );
#endif
} }
{ {
std::lock_guard<std::mutex> lock( m_data.lock ); std::lock_guard<std::mutex> lock( m_data.lock );
@ -3935,6 +3931,14 @@ void Worker::DoPostponedWork()
HandlePostponedGhostZones(); HandlePostponedGhostZones();
m_data.newFramesWereReceived = false; m_data.newFramesWereReceived = false;
} }
if( m_data.sourceLocationZonesReady )
{
for( auto& slz : m_data.sourceLocationZones )
{
if( !slz.second.zones.is_sorted() ) slz.second.zones.sort();
}
}
#endif #endif
if( m_data.newSymbolsIndex >= 0 ) if( m_data.newSymbolsIndex >= 0 )
@ -4557,10 +4561,11 @@ void Worker::ProcessZoneEnd( const QueueZoneEnd& ev )
const auto timeSpan = timeEnd - zone->Start(); const auto timeSpan = timeEnd - zone->Start();
if( timeSpan > 0 ) if( timeSpan > 0 )
{ {
auto slz = GetSourceLocationZones( zone->SrcLoc() ); ZoneThreadData ztd;
auto& ztd = slz->zones.push_next();
ztd.SetZone( zone ); ztd.SetZone( zone );
ztd.SetThread( CompressThread( m_threadCtx ) ); ztd.SetThread( CompressThread( m_threadCtx ) );
auto slz = GetSourceLocationZones( zone->SrcLoc() );
slz->zones.push_back( ztd );
if( slz->min > timeSpan ) slz->min = timeSpan; if( slz->min > timeSpan ) slz->min = timeSpan;
if( slz->max < timeSpan ) slz->max = timeSpan; if( slz->max < timeSpan ) slz->max = timeSpan;
slz->total += timeSpan; slz->total += timeSpan;
@ -6658,10 +6663,11 @@ void Worker::ReconstructZoneStatistics( ZoneEvent& zone, uint16_t thread )
{ {
auto it = m_data.sourceLocationZones.find( zone.SrcLoc() ); auto it = m_data.sourceLocationZones.find( zone.SrcLoc() );
assert( it != m_data.sourceLocationZones.end() ); assert( it != m_data.sourceLocationZones.end() );
auto& slz = it->second; ZoneThreadData ztd;
auto& ztd = slz.zones.push_next();
ztd.SetZone( &zone ); ztd.SetZone( &zone );
ztd.SetThread( thread ); ztd.SetThread( thread );
auto& slz = it->second;
slz.zones.push_back( ztd );
if( slz.min > timeSpan ) slz.min = timeSpan; if( slz.min > timeSpan ) slz.min = timeSpan;
if( slz.max < timeSpan ) slz.max = timeSpan; if( slz.max < timeSpan ) slz.max = timeSpan;
slz.total += timeSpan; slz.total += timeSpan;

4
server/TracyWorker.hpp
View File

@ -172,7 +172,9 @@ public:
private: private:
struct SourceLocationZones struct SourceLocationZones
{ {
Vector<ZoneThreadData> zones; struct ZtdSort { bool operator()( const ZoneThreadData& lhs, const ZoneThreadData& rhs ) { return lhs.Zone()->Start() < rhs.Zone()->Start(); } };
SortedVector<ZoneThreadData, ZtdSort> zones;
int64_t min = std::numeric_limits<int64_t>::max(); int64_t min = std::numeric_limits<int64_t>::max();
int64_t max = std::numeric_limits<int64_t>::min(); int64_t max = std::numeric_limits<int64_t>::min();
int64_t total = 0; int64_t total = 0;