From 5a36782c83ce9fb8ab3ae0f8f018da21e8681eff Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 31 Jul 2022 12:38:24 +0200 Subject: [PATCH] Fix inline functions not being attributed to symbols. Regression was introduced in commit 18112d3c6. --- server/TracyWorker.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 075eefe6..6a470d0b 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -1705,6 +1705,13 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks ) { m_data.symbolLocInline[symInlineIdx] = std::numeric_limits::max(); } +#ifdef NO_PARALLEL_SORT + pdqsort_branchless( m_data.symbolLoc.begin(), m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } ); + pdqsort_branchless( m_data.symbolLocInline.begin(), m_data.symbolLocInline.end() ); +#else + std::sort( std::execution::par_unseq, m_data.symbolLoc.begin(), m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } ); + std::sort( std::execution::par_unseq, m_data.symbolLocInline.begin(), m_data.symbolLocInline.end() ); +#endif f.Read( sz ); if( eventMask & EventType::SymbolCode )