get rid of ugly globals in DataFlowGraph

[fleet.git] / src / edu / berkeley / fleet / dataflow / MergeSort.java

diff --git a/src/edu/berkeley/fleet/dataflow/MergeSort.java b/src/edu/berkeley/fleet/dataflow/MergeSort.java
index e39e1b7..db2790d 100644 (file)
--- a/src/edu/berkeley/fleet/dataflow/MergeSort.java
+++ b/src/edu/berkeley/fleet/dataflow/MergeSort.java
@@ -1,4 +1,5 @@
 package edu.berkeley.fleet.dataflow;
+import java.util.*;
 import edu.berkeley.fleet.loops.*;
 import edu.berkeley.fleet.api.*;
 import edu.berkeley.fleet.fpga.*;
@@ -114,7 +115,8 @@ public class MergeSort {
             ctx2 = new Context(fp.getFleet());
 
             Destination ackDestination = counter.getDock("in2").getDataDestination();
-            int expected_tokens = proc.reset(ctx2, phase, ackDestination);
+            HashSet<Dock> sendTorpedoesTo = new HashSet<Dock>();
+            int expected_tokens = proc.reset(ctx2, phase, ackDestination, sendTorpedoesTo);
 
             Context ctx3 = new Context(fp.getFleet());
             lf = new LoopFactory(ctx3, counter.getDock("inOp"), 1);
@@ -137,7 +139,7 @@ public class MergeSort {
             lf.sendToken(debugIn.getDataDestination());
             ctx3.dispatch(fp);  // HACK: we don't check to make sure that this is "firmly in place"
 
-            for(Dock dock : DataFlowGraph.torpedoes) fp.sendToken(dock.getInstructionDestination());
+            for(Dock dock : sendTorpedoesTo) fp.sendToken(dock.getInstructionDestination());
             ctx2.dispatch(fp);
             fp.flush();
             System.out.println("flushed");