X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=nodestack.h;h=cd34ba42189977d25ed52e0a57b60c3ca25839ed;hb=ad07f2838b1b4b87c84f04ee67e0a28677a734ba;hp=55991c3022a50dc67e51ca607f3ca33e3e638ce2;hpb=a91144758ab80e865e5227c236e368fc0d3d77a9;p=c11tester.git

diff --git a/nodestack.h b/nodestack.h
index 55991c30..cd34ba42 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,8 +10,8 @@
 #include <inttypes.h>
 
 #include "mymemory.h"
-#include "modeltypes.h"
 #include "schedule.h"
+#include "promise.h"
 
 class ModelAction;
 class Thread;
@@ -32,11 +32,6 @@ 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;
@@ -76,7 +71,7 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
-	bool add_future_value(uint64_t value, modelclock_t expiration);
+	bool add_future_value(struct future_value fv);
 	struct future_value get_future_value() const;
 	bool increment_future_value();
 	bool future_value_empty() const;
@@ -104,7 +99,7 @@ public:
 	bool increment_relseq_break();
 	bool relseq_break_empty() const;
 
-	void print();
+	void print() const;
 	void print_may_read_from();
 
 	MEMALLOC