X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=nodestack.h;h=16264a2bbf800c6832e312cab644e85febb4f566;hp=37f9261149bc49a9d0a99182e21102be39e1161a;hb=bdef0741b8a01e16946d261bc2a657af5a683b3e;hpb=39e570d6dd512935c362b3e26e8c81dad43775f0

diff --git a/nodestack.h b/nodestack.h
index 37f9261..16264a2 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -7,14 +7,14 @@
 
 #include <list>
 #include <vector>
-#include <set>
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
 
 class ModelAction;
 
-typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -33,6 +33,8 @@ public:
 	bool has_been_explored(thread_id_t tid);
 	/* return true = backtrack set is empty */
 	bool backtrack_empty();
+	bool readsfrom_empty();
+	bool futurevalues_empty();
 	void explore_child(ModelAction *act);
 	/* return false = thread was already in backtrack */
 	bool set_backtrack(thread_id_t id);
@@ -44,9 +46,15 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
-	void add_read_from(ModelAction *act);
+	void add_future_value(uint64_t value);
+	void add_read_from(const ModelAction *act);
+	const ModelAction * get_read_from();
+	uint64_t get_future_value();
+	bool increment_read_from();
+	bool increment_future_values();
 
 	void print();
+	void print_may_read_from();
 
 	MEMALLOC
 private:
@@ -61,10 +69,14 @@ private:
 
 	/** The set of ModelActions that this the action at this Node may read
 	 *  from. Only meaningful if this Node represents a 'read' action. */
-	action_set_t may_read_from;
+	readfrom_set_t may_read_from;
+	unsigned int read_from_index;
+
+	futurevalues_t future_values;
+	unsigned int future_index;
 };
 
-typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
+typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -82,7 +94,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();