when using the Timer ship, invoke collectWord() twice just to be safe

diff --git a/src/edu/berkeley/fleet/dataflow/SortingDemo.java b/src/edu/berkeley/fleet/dataflow/SortingDemo.java
index af89c74..2690646 100644 (file)
--- a/src/edu/berkeley/fleet/dataflow/SortingDemo.java
+++ b/src/edu/berkeley/fleet/dataflow/SortingDemo.java
@@ -105,10 +105,14 @@ public class SortingDemo {
         // Timer //////////////////////////////////////////////////////////////////////////////
 
         lf = cb.loopFactory(timer.getDock("out"), 1);
+        // collect twice just to be safe
+        lf.collectWord();
         lf.collectWord();
         lf.sendToken(counter1.getDock("in1"));
         lf.sendWord(debug.getDock("in"));
         lf.recvToken();
+        // collect twice just to be safe
+        lf.collectWord();
         lf.collectWord();
         lf.sendWord(debug.getDock("in"));
 

diff --git a/src/edu/berkeley/fleet/loops/Program.java b/src/edu/berkeley/fleet/loops/Program.java
index 597549d..c356028 100644 (file)
--- a/src/edu/berkeley/fleet/loops/Program.java
+++ b/src/edu/berkeley/fleet/loops/Program.java
@@ -44,8 +44,11 @@ public class Program {
 
         CodeBag start = new CodeBag(fleet, this);
         lf = start.loopFactory(timer.getDock("out"), 1);
+        // collect twice just to be safe
+        lf.collectWord();
         lf.collectWord();
         lf.sendWord(debugIn.getDataDestination());
+
         lf = start.loopFactory(debugIn, 1);
         lf.recvWord();
         lf.deliver();
@@ -55,6 +58,8 @@ public class Program {
 
         CodeBag done  = end;
         lf = done.loopFactory(timer.getDock("out"), 1);
+        // collect twice just to be safe
+        lf.collectWord();
         lf.collectWord();
         lf.sendWord(debugIn.getDataDestination());