X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=fc3bf1d0911c8e43da840332ffa0b41758431fd9;hb=64cfd95313cb2f8b62cdfbe22a134889028b34e2;hp=0e952417b16c87a484712a94de4953bebc984d96;hpb=2ebb0b5a772c0bc5366c41c4980f3fd06f8081ae;p=c11tester.git

diff --git a/nodestack.h b/nodestack.h
index 0e952417..fc3bf1d0 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -13,7 +13,9 @@
 
 class ModelAction;
 
-typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
+typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -32,6 +34,7 @@ public:
 	bool has_been_explored(thread_id_t tid);
 	/* return true = backtrack set is empty */
 	bool backtrack_empty();
+
 	void explore_child(ModelAction *act);
 	/* return false = thread was already in backtrack */
 	bool set_backtrack(thread_id_t id);
@@ -43,9 +46,23 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
+	bool add_future_value(uint64_t value);
+	uint64_t get_future_value();
+	bool increment_future_value();
+	bool future_value_empty();
+
 	void add_read_from(const ModelAction *act);
+	const ModelAction * get_read_from();
+	bool increment_read_from();
+	bool read_from_empty();
+
+	void set_promise(uint32_t i);
+	bool get_promise(uint32_t i);
+	bool increment_promise();
+	bool promise_empty();
 
 	void print();
+	void print_may_read_from();
 
 	MEMALLOC
 private:
@@ -61,6 +78,11 @@ private:
 	/** The set of ModelActions that this the action at this Node may read
 	 *  from. Only meaningful if this Node represents a 'read' action. */
 	readfrom_set_t may_read_from;
+	unsigned int read_from_index;
+
+	futurevalues_t future_values;
+	promises_t promises;
+	unsigned int future_index;
 };
 
 typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
@@ -81,7 +103,7 @@ public:
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();
-
+	void pop_restofstack(int numAhead);
 	int get_total_nodes() { return total_nodes; }
 
 	void print();