projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fad55ce
)
MemoryNode: make sure not to do phase 0 of reset on out port
author
Adam Megacz
<adam@megacz.com>
Sun, 30 Aug 2009 00:12:10 +0000
(17:12 -0700)
committer
Adam Megacz
<adam@megacz.com>
Sun, 30 Aug 2009 00:12:10 +0000
(17:12 -0700)
src/edu/berkeley/fleet/dataflow/MemoryNode.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/fleet/dataflow/MemoryNode.java
b/src/edu/berkeley/fleet/dataflow/MemoryNode.java
index
a892672
..
e72f1c1
100644
(file)
--- a/
src/edu/berkeley/fleet/dataflow/MemoryNode.java
+++ b/
src/edu/berkeley/fleet/dataflow/MemoryNode.java
@@
-80,6
+80,12
@@
public class MemoryNode extends Node {
public void sendToken(LoopFactory lf) { inAddrWrite.peer.sendToken(lf); }
public void recvWord(LoopFactory lf) { lf.recvWord(); }
public int getTokensToAbsorb() { return 0; }
public void sendToken(LoopFactory lf) { inAddrWrite.peer.sendToken(lf); }
public void recvWord(LoopFactory lf) { lf.recvWord(); }
public int getTokensToAbsorb() { return 0; }
+ public int reset(CodeBag ctx, int phase, Destination ackDestination) {
+ // ugly-ass hack
+ if (phase!=0)
+ return DoneNode.doReset(ctx, phase, dock, this, peer, ackDestination, true);
+ return 0;
+ }
protected void build(CodeBag ctx, LoopFactory lf) {
lf = lf.makeNext(0);
lf.abortLoopIfTorpedoPresent();
protected void build(CodeBag ctx, LoopFactory lf) {
lf = lf.makeNext(0);
lf.abortLoopIfTorpedoPresent();