X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=fca063e7a4f86c2462f75a01f006d9c911487a26;hb=ec80014245d22f726e4d66a89b6bd6d293db177c;hp=1f7d3e4ad3fee660027e974261b8083b3a99e0c3;hpb=20d006a8c581117c6636e835cdbe36dac5d6ef93;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 1f7d3e4..fca063e 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -8,11 +8,13 @@
 #include <list>
 #include <vector>
 #include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
 #include "mymemory.h"
-#include "clockvector.h"
+#include "modeltypes.h"
 
 class ModelAction;
+class Thread;
 
 /**
  * A flag used for the promise counting/combination problem within a node,
@@ -64,7 +66,7 @@ public:
 	bool is_enabled(Thread *t);
 	bool is_enabled(thread_id_t tid);
 	ModelAction * get_action() { return action; }
-	bool has_priority(thread_id_t tid) {return fairness[id_to_int(tid)].priority;}
+	bool has_priority(thread_id_t tid);
 	int get_num_threads() {return num_threads;}
 	/** @return the parent Node to this Node; that is, the action that
 	 * occurred previously in the stack. */
@@ -98,24 +100,24 @@ private:
 	ModelAction *action;
 	Node *parent;
 	int num_threads;
-	std::vector< bool, MyAlloc<bool> > explored_children;
-	std::vector< bool, MyAlloc<bool> > backtrack;
-	std::vector< struct fairness_info, MyAlloc< struct fairness_info> > fairness;
+	std::vector< bool, ModelAlloc<bool> > explored_children;
+	std::vector< bool, ModelAlloc<bool> > backtrack;
+	std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
 	int numBacktracks;
 	bool *enabled_array;
 
 	/** The set of ModelActions that this the action at this Node may read
 	 *  from. Only meaningful if this Node represents a 'read' action. */
-	std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+	std::vector< const ModelAction *, ModelAlloc< const ModelAction * > > may_read_from;
 
 	unsigned int read_from_index;
 
-	std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
-	std::vector< promise_t, MyAlloc<promise_t> > promises;
-	unsigned int future_index;
+	std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
+	std::vector< promise_t, ModelAlloc<promise_t> > promises;
+	int future_index;
 };
 
-typedef std::vector< Node *, MyAlloc< Node * > > node_list_t;
+typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes