Merge pull request taskflow#692 from qq978358810/master

tsung-wei-huang · web-flow · commit 7b9f678e8f7e · 2025-05-14T22:46:24.000-05:00
Commit Message: Fix variable naming conflict and update header depend…
diff --git a/taskflow/core/atomic_notifier.hpp b/taskflow/core/atomic_notifier.hpp
@@ -5,6 +5,8 @@
 #include <atomic>
 #include <thread>
 #include <vector>
+#include <assert.h>
+#include "../utility/os.hpp"
 
 namespace tf {
 
diff --git a/taskflow/core/nonblocking_notifier.hpp b/taskflow/core/nonblocking_notifier.hpp
@@ -13,7 +13,7 @@
 #include <algorithm>
 #include <numeric>
 #include <cassert>
-
+#include "../utility/os.hpp"
 // This file is part of Eigen, a lightweight C++ template library
 // for linear algebra.
 //
@@ -505,14 +505,14 @@ class NonblockingNotifierV2 {
     for (;;) {
       //_check_state(state);
       const uint64_t waiters = (state & kWaiterMask) >> kWaiterShift;
-      const uint64_t signals = (state & kSignalMask) >> kSignalShift;
+      const uint64_t sigs = (state & kSignalMask) >> kSignalShift;
       // Easy case: no waiters.
-      if ((state & kStackMask) == kStackMask && waiters == signals) return;
+      if ((state & kStackMask) == kStackMask && waiters == sigs) return;
       uint64_t newstate;
       if (notifyAll) {
         // Empty wait stack and set signal to number of pre-wait threads.
         newstate = (state & kWaiterMask) | (waiters << kSignalShift) | kStackMask;
-      } else if (signals < waiters) {
+      } else if (sigs < waiters) {
         // There is a thread in pre-wait state, unblock it.
         newstate = state + kSignalInc;
       } else {
@@ -523,7 +523,7 @@ class NonblockingNotifierV2 {
       }
       //_check_state(newstate);
       if (_state.compare_exchange_weak(state, newstate, std::memory_order_acq_rel)) {
-        if (!notifyAll && (signals < waiters)) return;  // unblocked pre-wait thread
+        if (!notifyAll && (sigs < waiters)) return;  // unblocked pre-wait thread
         if ((state & kStackMask) == kStackMask) return;
         Waiter* w = &_waiters[state & kStackMask];
         if (!notifyAll) w->next.store(kStackMask, std::memory_order_relaxed);
