From 312c20b0bc974e7daaa6ff4ae780a6d082aa72da Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 12 May 2018 22:41:18 +0200 Subject: [PATCH] Fallback to pdqsort if parallel STL is not available. --- server/TracyWorker.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index fb89617a..5de3b60e 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -5,9 +5,15 @@ #endif #include -#include #include +#if __has_include() +# include +#else +# include "tracy_pdqsort.h" +# define MY_LIBCPP_SUCKS +#endif + #include "../common/TracyProtocol.hpp" #include "../common/TracySystem.hpp" #include "TracyFileRead.hpp" @@ -455,7 +461,11 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) for( auto& v : m_data.sourceLocationZones ) { auto& zones = v.second.zones; +#ifdef MY_LIBCPP_SUCKS + 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 lock( m_data.lock ); m_data.sourceLocationZonesReady = true; @@ -1296,7 +1306,11 @@ void Worker::HandlePostponedPlots() if( src.empty() ) continue; if( std::chrono::duration_cast( std::chrono::high_resolution_clock::now().time_since_epoch() ).count() - plot->postponeTime < 100 ) continue; auto& dst = plot->data; +#ifdef MY_LIBCPP_SUCKS + pdqsort_branchless( src.begin(), src.end(), [] ( const auto& l, const auto& r ) { return l.time < r.time; } ); +#else std::sort( std::execution::par_unseq, src.begin(), src.end(), [] ( const auto& l, const auto& r ) { return l.time < r.time; } ); +#endif const auto ds = std::lower_bound( dst.begin(), dst.end(), src.front().time, [] ( const auto& l, const auto& r ) { return l.time < r; } ); const auto dsd = std::distance( dst.begin(), ds ) ; const auto de = std::lower_bound( ds, dst.end(), src.back().time, [] ( const auto& l, const auto& r ) { return l.time < r; } ); @@ -1919,7 +1933,11 @@ void Worker::CreateMemAllocPlot() void Worker::ReconstructMemAllocPlot() { auto& mem = m_data.memory; +#ifdef MY_LIBCPP_SUCKS + pdqsort_branchless( mem.frees.begin(), mem.frees.end(), [&mem] ( const auto& lhs, const auto& rhs ) { return mem.data[lhs].timeFree < mem.data[rhs].timeFree; } ); +#else std::sort( std::execution::par_unseq, mem.frees.begin(), mem.frees.end(), [&mem] ( const auto& lhs, const auto& rhs ) { return mem.data[lhs].timeFree < mem.data[rhs].timeFree; } ); +#endif const auto psz = mem.data.size() + mem.frees.size() + 1;