@@ -303,11 +303,10 @@ std::shared_future<void> BasicTaskflow<E>::run_until(Framework& f, P&& predicate
 
     // Clear last execution data & Build precedence between nodes and target
     tpg._bind(f._graph);
-    int num_sinks = tpg._num_sinks; 
 
     do {
       _schedule(tpg._sources);
-      tpg._num_sinks = num_sinks;
+      tpg._num_sinks = tpg._cached_num_sinks;
     } while(!std::invoke(tpg._predicate));
 
     std::invoke(c);
@@ -327,11 +326,11 @@ std::shared_future<void> BasicTaskflow<E>::run_until(Framework& f, P&& predicate
     tpg._bind(f._graph);
   }
 
-  tpg._work = [&f, c=std::forward<C>(c), num_sinks=tpg._num_sinks.load(), this] () mutable {
+  tpg._work = [&f, c=std::forward<C>(c), this] () mutable {
 
     // case 1: we still need to run the topology again
     if(!std::invoke(f._topologies.front()->_predicate)) {
-      f._topologies.front()->_num_sinks = num_sinks;
+      f._topologies.front()->_num_sinks = f._topologies.front()->_cached_num_sinks;
       _schedule(f._topologies.front()->_sources); 
     }
     // case 2: the final run of this topology
@@ -348,7 +347,6 @@ std::shared_future<void> BasicTaskflow<E>::run_until(Framework& f, P&& predicate
         f._topologies.front()->_promise.set_value();
         f._topologies.pop_front();
         f._topologies.front()->_bind(f._graph);
-        num_sinks = f._topologies.front()->_num_sinks;
         f._mtx.unlock();
         _schedule(f._topologies.front()->_sources);
       }
 
@@ -45,6 +45,7 @@ class Topology {
 
     PassiveVector<Node*> _sources;
     std::atomic<int> _num_sinks {0};
+    int _cached_num_sinks;
 
     std::function<bool()> _predicate {nullptr};
     std::function<void()> _work {nullptr};
@@ -126,6 +127,7 @@ inline void Topology::_bind(Graph& g) {
       _num_sinks++;
     }
   }
+  _cached_num_sinks = _num_sinks;
 
 }
 
 
@@ -992,6 +992,54 @@ TEST_CASE("Framework" * doctest::timeout(300)) {
     REQUIRE(count == 210);    
   }
 
+
+  // Test run_until 
+  for(unsigned W=0; W<=4; ++W) {
+
+    std::atomic<size_t> count {0};
+    tf::Framework f;
+    auto A = f.silent_emplace([&](){ count ++; });
+    auto B = f.silent_emplace([&](auto& subflow){ 
+      count ++; 
+      auto B1 = subflow.silent_emplace([&](){ count++; });
+      auto B2 = subflow.silent_emplace([&](){ count++; });
+      auto B3 = subflow.silent_emplace([&](){ count++; });
+      B1.precede(B3); B2.precede(B3);
+    });
+    auto C = f.silent_emplace([&](){ count ++; });
+    auto D = f.silent_emplace([&](){ count ++; });
+
+    A.precede(B, C);
+    B.precede(D); 
+    C.precede(D);
+
+    tf::Taskflow tf(W);
+    tf.run_until(f, [run=10]() mutable { return run-- == 0; }, 
+      [&](){
+        REQUIRE(count == 70);
+        count = 0;
+      }
+    ).get();
+
+
+    tf.run_until(f, [run=10]() mutable { return run-- == 0; }, 
+      [&](){
+        REQUIRE(count == 70);
+        count = 0;
+        auto E = f.silent_emplace([&](){ count ++; });
+        auto F = f.silent_emplace([&](){ count ++; });
+        A.precede(E).precede(F);
+    });
+
+    tf.run_until(f, [run=10]() mutable { return run-- == 0; }, 
+      [&](){
+        REQUIRE(count == 90);
+        count = 0;
+      }
+    ).get();
+
+  }
+
 }
Original file line number	Diff line number	Diff line change
@@ -45,6 +45,7 @@ class Topology {
45	45
46	46	PassiveVector<Node*> _sources;
47	47	std::atomic<int> _num_sinks {0};
	48	+ int _cached_num_sinks;
48	49
49	50	std::function<bool()> _predicate {nullptr};
50	51	std::function<void()> _work {nullptr};
@@ -126,6 +127,7 @@ inline void Topology::_bind(Graph& g) {
126	127	_num_sinks++;
127	128	}
128	129	}
	130	+ _cached_num_sinks = _num_sinks;
129	131
130	132	}
131	133