From e3f9244375e3ddfb96a38afac007f0a5a68d3b46 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 12 May 2023 18:09:35 -0500
Subject: SL-19710 Fix for deadlock in LLPerfStats.  Move General thread
 initialization to earlier in session (unrelated).

---
 indra/newview/llperfstats.cpp | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'indra/newview/llperfstats.cpp')

diff --git a/indra/newview/llperfstats.cpp b/indra/newview/llperfstats.cpp
index 395ac0e788..64e66d520b 100644
--- a/indra/newview/llperfstats.cpp
+++ b/indra/newview/llperfstats.cpp
@@ -146,7 +146,7 @@ namespace LLPerfStats
         resetChanges();
     }
 
-    StatsRecorder::StatsRecorder():q(1024*16)
+    StatsRecorder::StatsRecorder()
     {
         // create a queue
         tunables.initialiseFromSettings();
@@ -292,26 +292,6 @@ namespace LLPerfStats
         sTotalAvatarTime = LLVOAvatar::getTotalGPURenderTime();
         sAverageAvatarTime = LLVOAvatar::getAverageGPURenderTime();
         sMaxAvatarTime = LLVOAvatar::getMaxGPURenderTime();
-
-        auto general = LL::WorkQueue::getInstance("General");
-
-        if (general)
-        {
-            general->post([] { StatsRecorder::update(); });
-        }
-    }
-
-    // called once per main loop iteration on General thread
-    void StatsRecorder::update()
-    {
-        LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-        StatsRecord upd;
-        auto& instance{ StatsRecorder::getInstance() };
-
-        while (enabled() && !LLApp::isQuitting() && instance.q.tryPop(upd))
-        {
-            instance.processUpdate(upd);
-        }
     }
 
     //static
-- 
cgit v1.2.3