X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=74ac245f3b3b00331a3328482d7c21c47bdc7cdb;hb=f3ef22bef8d339c7d45b7d7232cdcf183a0b7776;hp=2fd84ddeb11e98171ffacefa2fadad1e704079c4;hpb=810306cb85accaaace9a50f174264f105991230b;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 2fd84dd..74ac245 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -1,16 +1,24 @@
+/** @file nodestack.h
+ *  @brief Stack of operations for use in backtracking.
+*/
+
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
 #include <list>
 #include <vector>
+#include <set>
 #include <cstddef>
 #include "threads.h"
+#include "mymemory.h"
 
 class ModelAction;
 
+typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *parent = NULL);
+	Node(ModelAction *act = NULL, int nthreads = 1);
 	~Node();
 	/* return true = thread choice has already been explored */
 	bool has_been_explored(thread_id_t tid);
@@ -23,20 +31,26 @@ public:
 	bool is_enabled(Thread *t);
 	ModelAction * get_action() { return action; }
 
+	void add_read_from(ModelAction *act);
+
 	void print();
 
-	static int get_total_nodes() { return total_nodes; }
+	MEMALLOC
 private:
 	void explore(thread_id_t tid);
 
-	static int total_nodes;
 	ModelAction *action;
 	int num_threads;
-	std::vector<bool> explored_children;
-	std::vector<bool> backtrack;
+	std::vector< bool, MyAlloc<bool> > explored_children;
+	std::vector< bool, MyAlloc<bool> > backtrack;
+	int numBacktracks;
+
+	/** The set of ModelActions that this the action at this Node may read
+	 *  from. Only meaningful if this Node represents a 'read' action. */
+	action_set_t may_read_from;
 };
 
-typedef std::list<class Node *> node_list_t;
+typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
 
 class NodeStack {
 public:
@@ -47,10 +61,16 @@ public:
 	Node * get_next();
 	void reset_execution();
 
+	int get_total_nodes() { return total_nodes; }
+
 	void print();
+
+	MEMALLOC
 private:
 	node_list_t node_list;
 	node_list_t::iterator iter;
+
+	int total_nodes;
 };
 
 #endif /* __NODESTACK_H__ */