commit 32e6c2586011e0a231acc72597b7d0c8c6a26203
author Ben Fredrickson <ben.fred12345@gmail.com> Sat Feb 21 23:53:38 2015 -0800
committer Ben Fredrickson <ben.fred12345@gmail.com> Wed Feb 25 20:45:42 2015 -0800
tree d89d1b61ce8d0b3d218ffc5cd0bc108e2d4b40f7
parent 69365d3050f8ada118189c91aa62954d5b62dcee

StackCancel:
  - Added pass through of should cancel from the stack to the profile.
  - Split WaitUntilDone into an iterable function.
  - Added a test for stack action as this slipped through code reveiw.

Change-Id: I0d4c215b87f2919ff5164e86194ee6992e364190

aos/common/actions/actions.h

diff --git a/aos/common/actions/actions.h b/aos/common/actions/actions.h
index 15054d2..776c945 100644
--- a/aos/common/actions/actions.h
+++ b/aos/common/actions/actions.h
@@ -75,6 +75,10 @@
   // Waits until the action has finished.
   void WaitUntilDone() { DoWaitUntilDone(); }
 
+  // Run all the checks for one iteration of waiting. Will return true when the
+  // action has completed, successfully or not. This is non-blocking.
+  bool CheckIteration() { return DoCheckIteration(false); }
+
   // Retrieves the internal state of the action for testing.
   // See comments on the private members of TypedAction<T, S> for details.
   void GetState(bool* has_started, bool* sent_started, bool* sent_cancel,
@@ -94,6 +98,8 @@
   virtual void DoStart() = 0;
   // Blocks until complete.
   virtual void DoWaitUntilDone() = 0;
+  // Updates status for one cycle of waiting
+  virtual bool DoCheckIteration(bool blocking) = 0;
   // For testing we will need to get the internal state.
   // See comments on the private members of TypedAction<T, S> for details.
   virtual void DoGetState(bool* has_started, bool* sent_started,
@@ -141,6 +147,8 @@
 
   void DoWaitUntilDone() override;
 
+  bool DoCheckIteration(bool blocking);
+
   // Sets the started flag (also possibly the interrupted flag).
   void CheckStarted();
 
@@ -235,19 +243,34 @@
   queue_group_->status.FetchNext();
   CheckInterrupted();
   while (true) {
-    if (interrupted_) return;
-    CheckStarted();
-    queue_group_->status.FetchNextBlocking();
-    CheckStarted();
-    CheckInterrupted();
-    if (has_started_ && (queue_group_->status.get() &&
-                         queue_group_->status->running != run_value_)) {
+    if (DoCheckIteration(true)) {
       return;
     }
   }
 }
 
 template <typename T>
+bool TypedAction<T>::DoCheckIteration(bool blocking) {
+  CHECK(sent_started_);
+  if (interrupted_) return true;
+  CheckStarted();
+  if (blocking) {
+    queue_group_->status.FetchAnother();
+  } else {
+    if (!queue_group_->status.FetchNext()) {
+      return false;
+    }
+  }
+  CheckStarted();
+  CheckInterrupted();
+  if (has_started_ && (queue_group_->status.get() &&
+                       queue_group_->status->running != run_value_)) {
+    return true;
+  }
+  return false;
+}
+
+template <typename T>
 void TypedAction<T>::CheckStarted() {
   if (has_started_) return;
   if (queue_group_->status.get()) {