#2197: Queue epoch actions before notifying successors

DARMA-tasking · Sep 28, 2024 · c64e81b · c64e81b
1 parent 5538883
commit c64e81b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/vt/termination/term_action.cc b/src/vt/termination/term_action.cc
@@ -115,8 +115,11 @@ void TermAction::addActionEpoch(EpochType const& epoch, ActionType action) {
     return addAction(action);
   } else {
     auto encapsulated_epoch = getCurrentEpoch();
-    theTerm()->produce(encapsulated_epoch);
     epoch_actions_[epoch][encapsulated_epoch].push_back(action);
+
+    if (encapsulated_epoch != term::any_epoch_sentinel) {
+      theTerm()->addDependency(epoch, encapsulated_epoch);
+    }
   }
   afterAddEpochAction(epoch);
 }
@@ -134,7 +137,6 @@ void TermAction::triggerAllEpochActions(
     if (auto iter2 = iter->second.find(encapsulated_epoch);
         iter2 != iter->second.end()) {
       for (auto&& action : iter2->second) {
-        theTerm()->consume(encapsulated_epoch);
         action();
       }
       iter->second.erase(iter2);

diff --git a/src/vt/termination/termination.cc b/src/vt/termination/termination.cc
@@ -649,6 +649,9 @@ void TerminationDetector::epochTerminated(EpochType const& epoch, CallFromEnum f
     epoch, isRooted(epoch), isDS(epoch), from == CallFromEnum::Root ? true : false
   );
 
+  // Trigger actions associated with epoch
+  queueActions(epoch);
+
   // Clear all the successor epochs that are nested by this epoch (waiting on it
   // to complete)
   if (epoch != term::any_epoch_sentinel) {
@@ -658,9 +661,6 @@ void TerminationDetector::epochTerminated(EpochType const& epoch, CallFromEnum f
     }
   }
 
-  // Trigger actions associated with epoch
-  queueActions(epoch);
-
   // Update the window for the epoch archetype
   updateResolvedEpochs(epoch);