Acquire mutex during thread termination

mwilsnd · May 20, 2024 · ce46972 · ce46972
1 parent 94cf43c
commit ce46972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/mbgl/util/thread_pool.cpp b/src/mbgl/util/thread_pool.cpp
@@ -14,7 +14,10 @@ void ThreadedSchedulerBase::terminate() {
     // Run any leftover render jobs
     runRenderJobs();
 
-    terminated = true;
+    {
+        std::unique_lock<std::mutex> lock(workerMutex);
+        terminated = true;
+    }
 
     // Wake up all threads so that they shut down
     cvAvailable.notify_all();

diff --git a/src/mbgl/util/thread_pool.hpp b/src/mbgl/util/thread_pool.hpp
@@ -38,7 +38,7 @@ class ThreadedSchedulerBase : public Scheduler {
     std::mutex workerMutex;
     std::shared_mutex taggedQueueLock;
     util::ThreadLocal<ThreadedSchedulerBase> owningThreadPool;
-    std::atomic_bool terminated{false};
+    bool terminated{false};
 
     // Task queues bucketed by tag address
     struct Queue {