From 728fe06ea2e91634cfeae617b03dc42d35dc2f23 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 11 Jan 2006 02:22:56 -0500 Subject: [PATCH] checkpoint harmony darcs-hash:20060111072256-5007d-b85e9fbb2135c9a52c6739aee74e006bbef7633e.gz --- src/edu/berkeley/sbp/GSS.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 8c7b2db..4f8b4a9 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -140,7 +140,7 @@ class GSS { //return; } while(false); - Node n = new Node(parent, pending, state, fromEmptyReduction); // ALLOC + Node n = new Node(parent, pending, state); // ALLOC if (reducing) { n.queueEmptyReductions(); if (!fromEmptyReduction) n.queueReductions(parent); @@ -267,7 +267,6 @@ class GSS { public FastSet parents() { return this; } public void queueReductions() { - if (!reducing) return; if (allqueued) return; allqueued = true; state.invokeReductions(token, this, this, null); @@ -285,16 +284,11 @@ class GSS { else if (n2==null) r.reduce(n); else r.reduce(n, n2); } - public void queueEmptyReductions() { - if (!reducing) return; - state.invokeReductions(token, this, null, null); - } + public void queueEmptyReductions() { state.invokeReductions(token, this, null, null); } - private boolean fe; public boolean dead = false; public boolean redo = false; - private Node(Node parent, Forest pending, State state, boolean fe) { - this.fe = fe; + private Node(Node parent, Forest pending, State state) { this.state = state; this.holder().merge(pending); Phase start = parent==null ? null : parent.phase(); -- 1.7.10.4