X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=6db929bb8893f33fde1ff7f70c87b18665b729b4;hp=26b64486bf81c7ee4e323ad600851ac65146cbe0;hb=f169adc2b98fc4034d67bab4dd2938fb2f15e5c4;hpb=ea98ead8a9a46a7314da6faac96a31bfecd7002b

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 26b6448..6db929b 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -21,16 +21,14 @@ import java.lang.reflect.*;
 //          class is meant to remain simple and easy to understand;
 //          optimizations which obscure that do not belong here (they
 //          should go into the compiled version instead)
-//
-// - most of our time is now spent creating and storing Reduct instances
-// - we should be able to perform Reduct's immediately after creating them...
-//
 
 /** implements Tomita's Graph Structured Stack */
 class GSS {
 
     public GSS() { }
 
+    private Phase.Node[] reducing_list = null;
+
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
     public class Phase {
 
@@ -43,18 +41,9 @@ class GSS {
         /** FIXME */
         public  Forest.Ref finalResult = null;
 
-        /** all reductions (pending and completed) */
-        private HashSet<Phase.Reduct> reductions = new HashSet<Phase.Reduct>();     /* ALLOC */
-        
         /** all nodes, keyed by the value returned by code() */
         private HashMap<Long,Phase.Node> hash    = new HashMap<Long,Phase.Node>();  /* ALLOC */
 
-        /** the number of pending reductions */
-        private int pendingReductions = 0;
-        private int totalReductions = 0;
-        //private HashSet<Reduct> pendingReduct = new HashSet<Reduct>();
-        private LinkedList<Reduct> pendingReduct = new LinkedList<Reduct>();
-
         /** the number of nodes in this phase */
         private int numNodes = 0;
 
@@ -91,8 +80,8 @@ class GSS {
         }
         private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
             p.holder.merge(pending);
-            if (p.parents.contains(parent)) return;
-            p.parents.add(parent, true);
+            if (p.parents().contains(parent)) return;
+            p.parents().add(parent, true);
             if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
         }
         private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
@@ -103,7 +92,7 @@ class GSS {
                 int count = 0;
                 Parser.Table.Reduction r = null;
                 for(Parser.Table.Reduction red : token==null ? state.getEofReductions() : state.getReductions(token)) { r = red; count++; }
-                //if (count==0) return;     // BEWARE! this optimization is suspected to cause really nasty heisenbugs
+                if (count==0) return;     // BEWARE! this optimization is suspected to cause really nasty heisenbugs
                 //if (count > 1) break;
                 //if (r.numPop == 0) break;
                 //r.reduce(pending, parent, null, Phase.this, null);
@@ -112,7 +101,7 @@ class GSS {
 
             Node n = new Node(parent, pending, state, start);  // ALLOC
             n.queueEmptyReductions();
-            if (!fromEmptyReduction) n.queueReductions();
+            if (!fromEmptyReduction) n.queueReductions(parent);
         }
 
         
@@ -120,13 +109,17 @@ class GSS {
         /** perform all reduction operations */
         public void reduce() {
             reducing = true;
-            HashSet<Phase.Node> s = new HashSet<Phase.Node>();
-            s.addAll(hash.values());
-            for(Phase.Node n : s) n.queueEmptyReductions();
-            for(Phase.Node n : s) n.queueReductions();
-            while(pendingReduct.size()>0)
-                //pendingReduct.iterator().next().go();
-                pendingReduct.removeFirst().go();
+            if (reducing_list==null || reducing_list.length < hash.size())
+                reducing_list = new Phase.Node[hash.size() * 4];
+            Collection<Node> hv = hash.values();
+            hv.toArray(reducing_list);
+            int num = hv.size();
+            for(int i=0; i<num; i++) {
+                Node n = reducing_list[i];
+                reducing_list[i] = null;
+                n.queueEmptyReductions();
+                n.queueReductions();
+            }
         }
 
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
@@ -154,13 +147,13 @@ class GSS {
             if (!ok && token != null) {
                 StringBuffer error = new StringBuffer();
                 error.append("error: unable to shift token \"" + token + "\"\n");
-                error.append("  before: " +pendingReductions+ "\n");
-                error.append("  before: " +totalReductions+ "\n");
+                //error.append("  before: " +pendingReductions+ "\n");
+                //error.append("  before: " +totalReductions+ "\n");
                 //for(Phase.Node n : hash.values()) {
                 //n.queueReductions();
                 //n.queueEmptyReductions();
                 //}
-                error.append("  after: " +pendingReductions+ "\n");
+                //error.append("  after: " +pendingReductions+ "\n");
                 error.append("  candidate states:\n");
                 for(Phase.Node n : hash.values()) {
                     //for(Sequence.Position p : n.state) error.append("        " + p + "\n");
@@ -172,26 +165,26 @@ class GSS {
             }
 
             // this massively improves GC performance
-            reductions = null;
             hash = null;
         }
 
        
         // GSS Nodes //////////////////////////////////////////////////////////////////////////////
 
-        //private HashMap<Parser.Table.Reduction,Forest> pcache = new HashMap<Parser.Table.Reduction,Forest>();
         /** a node in the GSS */
-        public final class Node {
+        public final class Node extends FastSet<Node> {
 
             private Forest.Ref holder = null;
+            private boolean allqueued = false;
 
             private HashMap<Parser.Table.Reduction,Forest> cache = null;
 
             /** the set of nodes to which there is an edge starting at this node */
-            public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
+            //public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
 
             /** what state this node is in */
             public final Parser.Table.State state;
+
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
             public final Phase phase = Phase.this;
 
@@ -199,17 +192,48 @@ class GSS {
                 return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache; }
             public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
             public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
-            public  FastSet<Node> parents() { return parents; }
+            public  FastSet<Node> parents() { return this; }
 
             /** FIXME */
             public void queueReductions() {
-                for(Node n2 : parents)
-                    queueReductions(n2);
+                if (allqueued) return;
+                allqueued = true;
+                int where = parents().size();
+                for(int i=0; i<where; i++) queueReductions(get(i));
             }
 
             /** FIXME */
             public void queueReductions(Node n2) {
-                newReduct(this, n2, null);
+                if (!allqueued) { queueReductions(); return; }
+                Node n = this;
+                for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
+                    
+                    // UGLY HACK
+                    // The problem here is that a "reduction of length 1"
+                    // performed twice with different values of n2 needs
+                    // to only create a *single* new result, but must add
+                    // multiple parents to the node holding that result.
+                    // The current reducer doesn't differentiate between
+                    // the next node of an n-pop reduction and the
+                    // ultimate parent of the last pop, so we need to
+                    // cache instances here as a way of avoiding
+                    // recreating them.
+                    
+                    // currently we have this weird problem where we
+                    // have to do an individual reduct for each child
+                    // when the reduction length is one (ie the
+                    // children wind up being children of the newly
+                    // created node rather than part of the popped
+                    // sequence
+                    if (r.numPop <= 0) continue;
+                    if (r.numPop == 1) {
+                        Forest ret = n.cache().get(r);
+                        if (ret != null) r.reduce(n, n2, n.phase, ret);
+                        else n.cache().put(r, r.reduce(n, n2, n.phase, null));
+                    } else {
+                        r.reduce(n, n2, Phase.this, null);
+                    }
+                }
             }
 
 
@@ -224,7 +248,7 @@ class GSS {
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
                 this.state = state;
                 if (pending != null) this.holder().merge(pending);
-                if (parent != null) parents.add(parent, true);
+                if (parent != null) parents().add(parent, true);
                 if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
                 Phase.this.hash.put(code(state, start), this);
                 Phase.this.numNodes++;
@@ -232,96 +256,6 @@ class GSS {
             }
         }
 
-        public void newReduct(Node n, Node n2, Parser.Table.Reduction r) {
-            new Reduct(n, n2, r)/*.go()*/;
-        }
-
-        // Forest / Completed Reductions //////////////////////////////////////////////////////////////////////////////
-
-        /** a pending or completed reduction */
-        class Reduct {
-            
-            /** the node from which the reduction should begin */
-            public Node n = null;
-
-            /** the node on the other end of the edge to be reduced along (either: null, the second node of the reduction,
-             *  or the parent of the result of a length-one reduction)
-             */
-            public Node n2 = null;
-
-            /** true iff the reduction has already been performed */
-            private boolean done = false;
-
-            /** the reduction to be applied */
-            public Parser.Table.Reduction r;
-
-            public Tree<String> result = null;
-
-            public Reduct(Node n, Node n2, Parser.Table.Reduction r) {
-                this.n = n;
-                this.n2 = n2;
-                this.r = r;
-                if (reductions.contains(this)) { done = true; return; }
-                reductions.add(this);
-                pendingReduct.addFirst(this);
-                pendingReductions++;
-                //if (reducing) go();
-            }
-
-            /** perform the reduction */
-            public void go() {
-                if (done) return;
-                done = true;
-                pendingReduct.remove(this);
-                pendingReductions--;
-
-                if (r==null) {
-                    for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-                        
-                        // UGLY HACK
-                        // The problem here is that a "reduction of length 1"
-                        // performed twice with different values of n2 needs
-                        // to only create a *single* new result, but must add
-                        // multiple parents to the node holding that result.
-                        // The current reducer doesn't differentiate between
-                        // the next node of an n-pop reduction and the
-                        // ultimate parent of the last pop, so we need to
-                        // cache instances here as a way of avoiding
-                        // recreating them.
-
-                        // currently we have this weird problem where we
-                        // have to do an individual reduct for each child
-                        // when the reduction length is one (ie the
-                        // children wind up being children of the newly
-                        // created node rather than part of the popped
-                        // sequence
-                        
-                        if (r.numPop == 1) {
-                            Forest ret = n.cache().get(r);
-                            if (ret != null) r.reduce(n, n2, n.phase, ret);
-                            else n.cache().put(r, r.reduce(n, n2, n.phase, null));
-                        }
-                    }
-                    for(Parser.Table.Reduction r : token==null ? n.state.getEofReductions() : n.state.getReductions(token)) {
-                        if (r.numPop <= 1) continue;
-                        r.reduce(n, n2, Phase.this, null);
-                    }
-                } else if (r.numPop != 1) {
-                    r.reduce(n, n2, Phase.this, null);
-                }
-            }
-
-            // FIXME: this is a PITA
-            public int hashCode() { return n.hashCode() ^ (r==null ? 0 : r.hashCode()) ^ (n2==null ? 0 : n2.hashCode()); }
-            public boolean equals(Object o) {
-                if (o==null) return false;
-                if (o==this) return true;
-                if (!(o instanceof Reduct)) return false;
-                Reduct other = (Reduct)o;
-                return equal(r, other.r) && equal(n, other.n) && equal(n2, other.n2);
-            }
-        }
-
     }
 
     /** helper method */