more cleanup

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

diff --git a/src/edu/berkeley/fleet/dataflow/MemoryNode.java b/src/edu/berkeley/fleet/dataflow/MemoryNode.java
index e606803..cac6391 100644 (file)
--- a/src/edu/berkeley/fleet/dataflow/MemoryNode.java
+++ b/src/edu/berkeley/fleet/dataflow/MemoryNode.java
@@ -28,8 +28,8 @@ public class MemoryNode extends Node {
                 public void sendWord(LoopFactory lf) { lf.sendWord(ship.getDock("inAddrRead").getDataDestination(), new BitVector(1).set(0)); }
                 public void build(Context ctx) { }
                 public int getTokensToAbsorb() { return outRead1.peer.getTokensToAbsorb(); }
-                public void reset(Context ctx, int phase, Destination ackDestination) {
-                    doReset(ctx, phase, ship.getDock("inAddrRead"), null, ackDestination, false);
+                public int reset(Context ctx, int phase, Destination ackDestination) {
+                    return doReset(ctx, phase, ship.getDock("inAddrRead"), null, ackDestination, false);
                 }
             };
         this.inAddrRead2  = new InPort("inAddrRead2") {
@@ -37,19 +37,19 @@ public class MemoryNode extends Node {
                 public void sendWord(LoopFactory lf) { lf.sendWord(ship.getDock("inAddrRead").getDataDestination(), new BitVector(1).set(1)); }
                 public void build(Context ctx) { }
                 public int getTokensToAbsorb() { return outRead2.peer.getTokensToAbsorb(); }
-                public void reset(Context ctx, int phase, Destination ackDestination) { }
+                public int reset(Context ctx, int phase, Destination ackDestination) { return 0; }
             };
         this.outRead1 = new OutPort("outRead1") {
                 public void sendToken(LoopFactory lf) { inAddrRead1.peer.sendToken(lf); }
                 public void recvWord(LoopFactory lf) { lf.recvWord(); }
                 public void build(Context ctx) { }
-                public void reset(Context ctx, int phase, Destination ackDestination) { }
+                public int  reset(Context ctx, int phase, Destination ackDestination) { return 0; }
             };
         this.outRead2 = new OutPort("outRead2") {
                 public void sendToken(LoopFactory lf) { inAddrRead2.peer.sendToken(lf); }
                 public void recvWord(LoopFactory lf) { lf.recvWord(); }
                 public void build(Context ctx) { }
-                public void reset(Context ctx, int phase, Destination ackDestination) { }
+                public int  reset(Context ctx, int phase, Destination ackDestination) { return 0; }
             };
         this.outWrite = new DockOutPort("out", ship.getDock("out")) {
                 protected void build(Context ctx, LoopFactory lf) {