..

Author: David-Haim

source/executors/thread_pool_executor.cpp

@@ -44,10 +44,7 @@ namespace concurrencpp::details {
         const std::function<void(std::string_view thread_name)> m_thread_terminated_callback;
 
         void balance_work();
-
-        bool wait_for_task(std::unique_lock<std::mutex>& lock);
         bool drain_queue_impl();
-        bool drain_queue();
 
         void work_loop();
 
@@ -278,14 +275,12 @@ void thread_pool_worker::balance_work() {
 }
 
 bool thread_pool_worker::drain_queue_impl() {
-    auto aborted = false;
-
     while (!m_private_queue.empty()) {
         balance_work();
 
         if (m_atomic_abort.load(std::memory_order_relaxed)) {
-            aborted = true;
-            break;
+            mark_worker_stale();
+            return false;
         }
 
         assert(!m_private_queue.empty());
@@ -294,11 +289,6 @@ bool thread_pool_worker::drain_queue_impl() {
         task();
     }
 
-    if (aborted) {
-        mark_worker_stale();
-        return false;
-    }
-
     return true;
 }