X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=f74a2938992078a9eeaabc90e9a5100da8b7fabf;hb=4e8626fa3721aededd84133382625e20ae6490cf;hp=87b3ee531fbe2d10a7b52f229f23e7ea90196e9d;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a;p=model-checker.git

diff --git a/nodestack.cc b/nodestack.cc
index 87b3ee5..f74a293 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -3,15 +3,31 @@
 #include "common.h"
 #include "model.h"
 
-/** @brief Node constructor */
-Node::Node(ModelAction *act, int nthreads)
+/**
+ * @brief Node constructor
+ *
+ * Constructs a single Node for use in a NodeStack. Each Node is associated
+ * with exactly one ModelAction (exception: the first Node should be created
+ * as an empty stub, to represent the first thread "choice") and up to one
+ * parent.
+ *
+ * @param act The ModelAction to associate with this Node. May be NULL.
+ * @param par The parent Node in the NodeStack. May be NULL if there is no
+ * parent.
+ * @param nthreads The number of threads which exist at this point in the
+ * execution trace.
+ */
+Node::Node(ModelAction *act, Node *par, int nthreads)
 	: action(act),
+	parent(par),
 	num_threads(nthreads),
 	explored_children(num_threads),
 	backtrack(num_threads),
 	numBacktracks(0),
 	may_read_from()
 {
+	if (act)
+		act->set_node(this);
 }
 
 /** @brief Node desctructor */
@@ -53,14 +69,11 @@ bool Node::backtrack_empty()
 }
 
 /**
- * Explore a child Node using a given ModelAction. This updates both the
- * Node-internal and the ModelAction data to associate the ModelAction with
- * this Node.
- * @param act is the ModelAction to explore
+ * Mark the appropriate backtracking infromation for exploring a thread choice.
+ * @param act The ModelAction to explore
  */
 void Node::explore_child(ModelAction *act)
 {
-	act->set_node(this);
 	explore(act->get_tid());
 }
 
@@ -106,7 +119,7 @@ bool Node::is_enabled(Thread *t)
  */
 void Node::add_read_from(ModelAction *act)
 {
-	may_read_from.insert(act);
+	may_read_from.push_back(act);
 }
 
 void Node::explore(thread_id_t tid)
@@ -173,7 +186,7 @@ ModelAction * NodeStack::explore_action(ModelAction *act)
 
 	/* Record action */
 	get_head()->explore_child(act);
-	node_list.push_back(new Node(act, model->get_num_threads()));
+	node_list.push_back(new Node(act, get_head(), model->get_num_threads()));
 	total_nodes++;
 	iter++;
 	return NULL;