SL-18721 Shutdown fixes #5

akleshchev · akleshchev · commit d1d3ee709163 · 2024-02-27T23:02:19.000+02:00
diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
@@ -120,8 +120,11 @@ void LL::ThreadPoolBase::close()
         mQueue->close();
         for (auto& pair: mThreads)
         {
-            LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL;
-            pair.second.join();
+            if (pair.second.joinable())
+            {
+                LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL;
+                pair.second.join();
+            }
         }
         LL_DEBUGS("ThreadPool") << mName << " shutdown complete" << LL_ENDL;
     }

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,11 @@ void LL::ThreadPoolBase::close()`
`120`	`120`	`mQueue->close();`
`121`	`121`	`for (auto& pair: mThreads)`
`122`	`122`	`{`
`123`		`- LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL;`
`124`		`- pair.second.join();`
	`123`	`+ if (pair.second.joinable())`
	`124`	`+ {`
	`125`	`+ LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL;`
	`126`	`+ pair.second.join();`
	`127`	`+ }`
`125`	`128`	`}`
`126`	`129`	`LL_DEBUGS("ThreadPool") << mName << " shutdown complete" << LL_ENDL;`
`127`	`130`	`}`