X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=803d2b8e492c05a98f23a628550dd4f05265e23f;hb=188fd67da0c7cb891960093e85bb4c9a5718050d;hp=8df67838c87c362518bdd3100bddcd4663254475;hpb=3b39a4cdcd7eafca5480e9d9bdec4d24fe5441b3;p=cdsspec-compiler.git

diff --git a/nodestack.h b/nodestack.h
index 8df6783..803d2b8 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -8,11 +8,14 @@
 #include <list>
 #include <vector>
 #include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
 #include "mymemory.h"
-#include "clockvector.h"
+#include "modeltypes.h"
+#include "schedule.h"
 
 class ModelAction;
+class Thread;
 
 /**
  * A flag used for the promise counting/combination problem within a node,
@@ -57,14 +60,14 @@ public:
 	/* return true = backtrack set is empty */
 	bool backtrack_empty();
 
-	void explore_child(ModelAction *act, bool * is_enabled);
+	void explore_child(ModelAction *act, enabled_type_t * is_enabled);
 	/* return false = thread was already in backtrack */
 	bool set_backtrack(thread_id_t id);
 	thread_id_t get_next_backtrack();
 	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. */
@@ -87,6 +90,12 @@ public:
 	bool get_promise(unsigned int i);
 	bool increment_promise();
 	bool promise_empty();
+	enabled_type_t *get_enabled_array() {return enabled_array;}
+
+	void add_relseq_break(const ModelAction *write);
+	const ModelAction * get_relseq_break();
+	bool increment_relseq_break();
+	bool relseq_break_empty();
 
 	void print();
 	void print_may_read_from();
@@ -102,7 +111,7 @@ private:
 	std::vector< bool, ModelAlloc<bool> > backtrack;
 	std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
 	int numBacktracks;
-	bool *enabled_array;
+	enabled_type_t *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. */
@@ -113,6 +122,9 @@ private:
 	std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
 	std::vector< promise_t, ModelAlloc<promise_t> > promises;
 	int future_index;
+
+	std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
+	int relseq_break_index;
 };
 
 typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
@@ -129,7 +141,7 @@ class NodeStack {
 public:
 	NodeStack();
 	~NodeStack();
-	ModelAction * explore_action(ModelAction *act, bool * is_enabled);
+	ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();