X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=nodestack.h;h=996bdf3f68fc51e72534815e5caebeab8dc77014;hb=fa66b938f4e55cc23d84153614387bc4f76fdf2a;hp=9ccde8da34e953052660292d6b865cb53dbe76e0;hpb=5e4a7d161cba81152ddcf295ee72fbb25ba3afaa;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 9ccde8d..996bdf3 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -13,9 +13,6 @@
 
 class ModelAction;
 
-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,8 +30,7 @@ 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);
@@ -47,11 +43,19 @@ public:
 	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();
-	uint64_t get_future_value();
 	bool increment_read_from();
-	bool increment_future_values();
+	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();
@@ -69,10 +73,12 @@ 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;
+	std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
 	unsigned int read_from_index;
 
-	futurevalues_t future_values;
+	std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
+	std::vector< uint32_t, MyAlloc< uint32_t > > promises;
 	unsigned int future_index;
 };