[core] Fix ThreadPool race condition (#6388)

2 files changed, 13 insertions, 7 deletions

diff --git a/src/mbgl/actor/thread_pool.cpp b/src/mbgl/actor/thread_pool.cpp
index 89ca1b72f0..2995ed26ad 100644
--- a/src/mbgl/actor/thread_pool.cpp
+++ b/src/mbgl/actor/thread_pool.cpp
@@ -11,10 +11,10 @@ ThreadPool::ThreadPool(std::size_t count) {
                 std::unique_lock<std::mutex> lock(mutex);
 
                 cv.wait(lock, [this] {
-                    return !queue.empty() || terminate.load();
+                    return !queue.empty() || terminate;
                 });
 
-                if (terminate.load()) {
+                if (terminate) {
                     return;
                 }
 
@@ -31,7 +31,11 @@ ThreadPool::ThreadPool(std::size_t count) {
 }
 
 ThreadPool::~ThreadPool() {
-    terminate.store(true);
+    {
+        std::lock_guard<std::mutex> lock(mutex);
+        terminate = true;
+    }
+
     cv.notify_all();
 
     for (auto& thread : threads) {
@@ -40,8 +44,11 @@ ThreadPool::~ThreadPool() {
 }
 
 void ThreadPool::schedule(std::weak_ptr<Mailbox> mailbox) {
-    std::lock_guard<std::mutex> lock(mutex);
-    queue.push(mailbox);
+    {
+        std::lock_guard<std::mutex> lock(mutex);
+        queue.push(mailbox);
+    }
+
     cv.notify_one();
 }
 
diff --git a/src/mbgl/actor/thread_pool.hpp b/src/mbgl/actor/thread_pool.hpp
index 7e0b40f4e3..a14d16d771 100644
--- a/src/mbgl/actor/thread_pool.hpp
+++ b/src/mbgl/actor/thread_pool.hpp
@@ -2,7 +2,6 @@
 
 #include <mbgl/actor/scheduler.hpp>
 
-#include <atomic>
 #include <condition_variable>
 #include <mutex>
 #include <queue>
@@ -22,7 +21,7 @@ private:
     std::queue<std::weak_ptr<Mailbox>> queue;
     std::mutex mutex;
     std::condition_variable cv;
-    std::atomic_bool terminate { false };
+    bool terminate { false };
 };
 
 } // namespace mbgl