X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=648ef4dfc318afc38a4e98b1e31bf4a1bcc944eb;hb=37bf8e7d54c72e0aeee029a491e45bb9d7b2f409;hp=fca063e7a4f86c2462f75a01f006d9c911487a26;hpb=81ea453e58cbb85fddff3aa8919dfbc59c3140eb;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index fca063e..648ef4d 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -12,6 +12,7 @@
 
 #include "mymemory.h"
 #include "modeltypes.h"
+#include "schedule.h"
 
 class ModelAction;
 class Thread;
@@ -52,19 +53,21 @@ struct fairness_info {
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
+	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = NULL);
 	~Node();
 	/* return true = thread choice has already been explored */
 	bool has_been_explored(thread_id_t tid);
 	/* 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);
+	enabled_type_t enabled_status(thread_id_t tid);
+
 	ModelAction * get_action() { return action; }
 	bool has_priority(thread_id_t tid);
 	int get_num_threads() {return num_threads;}
@@ -89,6 +92,17 @@ public:
 	bool get_promise(unsigned int i);
 	bool increment_promise();
 	bool promise_empty();
+	enabled_type_t *get_enabled_array() {return enabled_array;}
+
+	void set_misc_max(int i);
+	int get_misc();
+	bool increment_misc();
+	bool misc_empty();
+
+	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();
@@ -104,7 +118,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. */
@@ -115,6 +129,12 @@ 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;
+
+	int misc_index;
+	int misc_max;
 };
 
 typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
@@ -131,7 +151,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();