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

Handle postponed samples with SortedVector.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-11-14 23:48:50 +01:00
parent 590a4afb89
commit 710a488af0
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/TracyEvent.hpp
View File

@ -264,6 +264,8 @@ struct SampleData
enum { SampleDataSize = sizeof( SampleData ) }; enum { SampleDataSize = sizeof( SampleData ) };
struct SampleDataSort { bool operator()( const SampleData& lhs, const SampleData& rhs ) { return lhs.time.Val() < rhs.time.Val(); }; };
struct SampleDataRange struct SampleDataRange
{ {
@ -633,7 +635,7 @@ struct ThreadData
Vector<int64_t> childTimeStack; Vector<int64_t> childTimeStack;
Vector<GhostZone> ghostZones; Vector<GhostZone> ghostZones;
uint64_t ghostIdx; uint64_t ghostIdx;
Vector<SampleData> postponedSamples; SortedVector<SampleData, SampleDataSort> postponedSamples;
#endif #endif
Vector<SampleData> samples; Vector<SampleData> samples;
SampleData pendingSample; SampleData pendingSample;

6
server/TracyWorker.cpp
View File

@ -4358,11 +4358,7 @@ void Worker::DoPostponedWork()
auto ctx = GetContextSwitchData( td->id ); auto ctx = GetContextSwitchData( td->id );
if( ctx ) if( ctx )
{ {
#ifdef NO_PARALLEL_SORT td->postponedSamples.ensure_sorted();
pdqsort_branchless( td->postponedSamples.begin(), td->postponedSamples.end(), [] ( const auto& l, const auto& r ) { return l.time.Val() < r.time.Val(); } );
#else
std::sort( std::execution::par_unseq, td->postponedSamples.begin(), td->postponedSamples.end(), [] ( const auto& l, const auto& r ) { return l.time.Val() < r.time.Val(); } );
#endif
auto sit = td->postponedSamples.begin(); auto sit = td->postponedSamples.begin();
auto cit = std::lower_bound( ctx->v.begin(), ctx->v.end(), sit->time.Val(), [] ( const auto& l, const auto& r ) { return (uint64_t)l.End() < (uint64_t)r; } ); auto cit = std::lower_bound( ctx->v.begin(), ctx->v.end(), sit->time.Val(), [] ( const auto& l, const auto& r ) { return (uint64_t)l.End() < (uint64_t)r; } );
if( cit != ctx->v.end() ) if( cit != ctx->v.end() )