From 79198eddf76dfa69e8161f7646d8da19853a8a5a Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Fri, 7 Jul 2023 20:24:49 +0300 Subject: SL-19966 Reverted "SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption" This reverts commit cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99. --- indra/llcommon/threadpool.cpp | 5 ----- indra/llcommon/threadpool.h | 4 ---- indra/llwindow/llwindowwin32.cpp | 3 --- 3 files changed, 12 deletions(-) diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp index 4a7ead2110..d5adf11264 100644 --- a/indra/llcommon/threadpool.cpp +++ b/indra/llcommon/threadpool.cpp @@ -39,11 +39,6 @@ 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 0a5f14529b..f8eec3b457 100644 --- a/indra/llcommon/threadpool.h +++ b/indra/llcommon/threadpool.h @@ -59,10 +59,6 @@ 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 2f1a631585..2e560ddb0a 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4592,9 +4592,6 @@ 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