From 331c2bd7c0099252f070b19f6ebec4555a44e4ae Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Mon, 1 May 2023 14:41:51 +0200 Subject: [PATCH] Configure number of threads in TimelineController. --- server/TracyTimelineController.cpp | 4 ++-- server/TracyTimelineController.hpp | 2 +- server/TracyView.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/TracyTimelineController.cpp b/server/TracyTimelineController.cpp index f1cbe80c..75f3163c 100644 --- a/server/TracyTimelineController.cpp +++ b/server/TracyTimelineController.cpp @@ -9,7 +9,7 @@ namespace tracy { -TimelineController::TimelineController( View& view, Worker& worker ) +TimelineController::TimelineController( View& view, Worker& worker, bool threading ) : m_height( 0 ) , m_scroll( 0 ) , m_centerItemkey( nullptr ) @@ -20,7 +20,7 @@ TimelineController::TimelineController( View& view, Worker& worker ) #ifdef __EMSCRIPTEN__ , m_td( 1 ) #else - , m_td( std::max( 1u, std::thread::hardware_concurrency() - 2 ), "Render" ) + , m_td( threading ? std::max( 1u, std::thread::hardware_concurrency() - 2 ) : 1, "Render" ) #endif { } diff --git a/server/TracyTimelineController.hpp b/server/TracyTimelineController.hpp index 35258f2f..a2880572 100644 --- a/server/TracyTimelineController.hpp +++ b/server/TracyTimelineController.hpp @@ -20,7 +20,7 @@ class Worker; class TimelineController { public: - TimelineController( View& view, Worker& worker ); + TimelineController( View& view, Worker& worker, bool threading ); ~TimelineController(); void FirstFrameExpired(); diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 70376ce0..9a22ebdb 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -50,7 +50,7 @@ View::View( void(*cbMainThread)(const std::function&, bool), const char* , m_viewMode( ViewMode::LastFrames ) , m_viewModeHeuristicTry( true ) , m_forceConnectionPopup( true, true ) - , m_tc( *this, m_worker ) + , m_tc( *this, m_worker, config.threadedRendering ) , m_frames( nullptr ) , m_messagesScrollBottom( true ) , m_reactToCrash( true ) @@ -73,7 +73,7 @@ View::View( void(*cbMainThread)(const std::function&, bool), FileRead& f , m_filename( f.GetFilename() ) , m_staticView( true ) , m_viewMode( ViewMode::Paused ) - , m_tc( *this, m_worker ) + , m_tc( *this, m_worker, config.threadedRendering ) , m_frames( m_worker.GetFramesBase() ) , m_messagesScrollBottom( false ) , m_smallFont( smallFont )