X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=648ef4dfc318afc38a4e98b1e31bf4a1bcc944eb;hb=e8e32b7efa96a0b36c1475b58368d002408a7ea7;hp=803d2b8e492c05a98f23a628550dd4f05265e23f;hpb=b8b39c87557325a384faa45d0cae56a6f71f52b1;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 803d2b8..648ef4d 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -53,7 +53,7 @@ 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);
@@ -66,6 +66,8 @@ public:
 	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;}
@@ -92,6 +94,11 @@ public:
 	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();
@@ -125,6 +132,9 @@ private:
 
 	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;