From cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Mon, 20 Mar 2023 10:20:06 +0100 Subject: SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption --- indra/llcommon/threadpool.cpp | 5 +++++ indra/llcommon/threadpool.h | 4 ++++ indra/llwindow/llwindowwin32.cpp | 3 +++ 3 files changed, 12 insertions(+) (limited to 'indra') diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp index d5adf11264..4a7ead2110 100644 --- a/indra/llcommon/threadpool.cpp +++ b/indra/llcommon/threadpool.cpp @@ -39,6 +39,11 @@ void LL::ThreadPool::start() run(tname); }); } + + // Special workflow for LLWindowWin32Thread - it's close() should be called explicitly + if (mExplicitShutdown) + return; + // Listen on "LLApp", and when the app is shutting down, close the queue // and join the workers. LLEventPumps::instance().obtain("LLApp").listen( diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h index f8eec3b457..0a5f14529b 100644 --- a/indra/llcommon/threadpool.h +++ b/indra/llcommon/threadpool.h @@ -59,6 +59,10 @@ namespace LL */ virtual void run(); + protected: + // LLWindowWin32Thread should set this flag to true + bool mExplicitShutdown { false }; + private: void run(const std::string& name); diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 41f3042ace..afe26ec5a4 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4581,6 +4581,9 @@ std::vector LLWindowWin32::getDynamicFallbackFontList() inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread() : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE) { + // Set this flag to true to avoid of implicit call of close() from start() + mExplicitShutdown = true; + ThreadPool::start(); } -- cgit v1.2.3