From 7d1a37de2df05a377e2967eb71084d8bb341c867 Mon Sep 17 00:00:00 2001 From: David McCloskey Date: Fri, 10 Jul 2026 12:00:48 -0500 Subject: [PATCH] Pulling implementation in to a separate function. --- profiler/src/profiler/TracyView.hpp | 11 +++++++++++ profiler/src/profiler/TracyView_FlameGraph.cpp | 7 +------ profiler/src/profiler/TracyView_Options.cpp | 7 +------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/profiler/src/profiler/TracyView.hpp b/profiler/src/profiler/TracyView.hpp index c9d7dbdf..1b15884b 100644 --- a/profiler/src/profiler/TracyView.hpp +++ b/profiler/src/profiler/TracyView.hpp @@ -31,6 +31,7 @@ #include "../server/TracyWorker.hpp" #include "../server/tracy_robin_hood.h" #include "../server/TracyVector.hpp" +#include "../server/tracy_pdqsort.h" #ifndef __EMSCRIPTEN__ # include "TracyLlm.hpp" @@ -517,6 +518,16 @@ private: return it->second; } + tracy_force_inline void SortThreads() + { + pdqsort_branchless( m_threadOrder.begin(), m_threadOrder.end(), [this] ( const auto& lhs, const auto& rhs ) { + if( lhs->groupHint != rhs->groupHint ) return lhs->groupHint < rhs->groupHint; + const auto cmp = strcmp( m_worker.GetThreadName( lhs->id ), m_worker.GetThreadName( rhs->id ) ); + if( cmp != 0 ) return cmp < 0; + return lhs->id < rhs->id; + } ); + } + static int64_t AdjustGpuTime( int64_t time, int64_t begin, int drift ); static const char* DecodeContextSwitchState( uint8_t state ); diff --git a/profiler/src/profiler/TracyView_FlameGraph.cpp b/profiler/src/profiler/TracyView_FlameGraph.cpp index adcebda8..77d234af 100644 --- a/profiler/src/profiler/TracyView_FlameGraph.cpp +++ b/profiler/src/profiler/TracyView_FlameGraph.cpp @@ -1072,12 +1072,7 @@ void View::DrawFlameGraph() ImGui::SameLine(); if( ImGui::SmallButton( "Sort" ) ) { - pdqsort_branchless( m_threadOrder.begin(), m_threadOrder.end(), [this] ( const auto& lhs, const auto& rhs ) { - if( lhs->groupHint != rhs->groupHint ) return lhs->groupHint < rhs->groupHint; - const auto cmp = strcmp( m_worker.GetThreadName( lhs->id ), m_worker.GetThreadName( rhs->id ) ); - if( cmp != 0 ) return cmp < 0; - return lhs->id < rhs->id; - } ); + SortThreads(); } const auto& style = ImGui::GetStyle(); diff --git a/profiler/src/profiler/TracyView_Options.cpp b/profiler/src/profiler/TracyView_Options.cpp index 8ad879bb..c9c341cd 100644 --- a/profiler/src/profiler/TracyView_Options.cpp +++ b/profiler/src/profiler/TracyView_Options.cpp @@ -698,12 +698,7 @@ void View::DrawOptions() ImGui::SameLine(); if( ImGui::SmallButton( "Sort" ) ) { - pdqsort_branchless( m_threadOrder.begin(), m_threadOrder.end(), [this] ( const auto& lhs, const auto& rhs ) { - if( lhs->groupHint != rhs->groupHint ) return lhs->groupHint < rhs->groupHint; - const auto cmp = strcmp( m_worker.GetThreadName( lhs->id ), m_worker.GetThreadName( rhs->id ) ); - if( cmp != 0 ) return cmp < 0; - return lhs->id < rhs->id; - } ); + SortThreads(); } const auto wposx = ImGui::GetCursorScreenPos().x;