X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=47c72678aa13cffb9294e6a7d842860136e37baf;hb=82df62c2b0805848b87bb71df5b66a4a66f8e25d;hp=44d739c9e9d752565fe76b67b4b49dce4cf778d9;hpb=24032577ab44f5adb4f072d022f70d0b0162ab90;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 44d739c..47c7267 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,14 +5,13 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <inttypes.h>
 
 #include "mymemory.h"
-#include "modeltypes.h"
 #include "schedule.h"
+#include "promise.h"
 
 class ModelAction;
 class Thread;
@@ -33,18 +32,12 @@ class Thread;
 
 typedef int promise_t;
 
-struct future_value {
-	uint64_t value;
-	modelclock_t expiration;
-};
-
 struct fairness_info {
 	unsigned int enabled_count;
 	unsigned int turns;
 	bool priority;
 };
 
-
 /**
  * @brief A single node in a NodeStack
  *
@@ -56,14 +49,14 @@ struct fairness_info {
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = NULL);
+	Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness);
 	~Node();
 	/* return true = thread choice has already been explored */
 	bool has_been_explored(thread_id_t tid) const;
 	/* return true = backtrack set is empty */
 	bool backtrack_empty() const;
 
-	void explore_child(ModelAction *act, enabled_type_t * 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();
@@ -78,9 +71,8 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
-	bool add_future_value(uint64_t value, modelclock_t expiration);
-	uint64_t get_future_value() const;
-	modelclock_t get_future_value_expiration() const;
+	bool add_future_value(struct future_value& fv);
+	struct future_value get_future_value() const;
 	bool increment_future_value();
 	bool future_value_empty() const;
 
@@ -89,7 +81,7 @@ public:
 	bool increment_read_from();
 	bool read_from_empty() const;
 	int get_read_from_size() const;
-	const ModelAction * get_read_from_at(int i);
+	const ModelAction * get_read_from_at(int i) const;
 
 	void set_promise(unsigned int i, bool is_rmw);
 	bool get_promise(unsigned int i) const;
@@ -107,16 +99,16 @@ public:
 	bool increment_relseq_break();
 	bool relseq_break_empty() const;
 
-	void print();
+	void print() const;
 	void print_may_read_from();
 
 	MEMALLOC
 private:
 	void explore(thread_id_t tid);
 
-	ModelAction *action;
-	Node *parent;
-	int num_threads;
+	ModelAction * const action;
+	Node * const parent;
+	const int num_threads;
 	std::vector< bool, ModelAlloc<bool> > explored_children;
 	std::vector< bool, ModelAlloc<bool> > backtrack;
 	std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
@@ -171,7 +163,7 @@ private:
 	 * @brief the index position of the current head Node
 	 *
 	 * This index is relative to node_list. The index should point to the
-	 * current head Node.
+	 * current head Node. It is negative when the list is empty.
 	 */
 	int head_idx;