X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=63c0375211c513ef704c4ee4c3fbb8abe832fdb5;hp=5ec109883118af17cc3abf860594d58383ab0909;hb=0b3c8355b0f1fdf7e4b983bef11472192405a9d9;hpb=fab8621e4bf6acafc04dbaf786e2de6263d892f6

diff --git a/action.h b/action.h
index 5ec10988..63c03752 100644
--- a/action.h
+++ b/action.h
@@ -15,6 +15,7 @@
 
 class ClockVector;
 class Thread;
+class Promise;
 
 using std::memory_order;
 using std::memory_order_relaxed;
@@ -80,11 +81,13 @@ public:
 	modelclock_t get_seq_number() const { return seq_number; }
 	uint64_t get_value() const { return value; }
 	const ModelAction * get_reads_from() const { return reads_from; }
+	const Promise * get_reads_from_promise() const { return reads_from_promise; }
 
 	Node * get_node() const;
 	void set_node(Node *n) { node = n; }
 
 	void set_read_from(const ModelAction *act);
+	void set_read_from_promise(const Promise *promise);
 
 	/** Store the most recent fence-release from the same thread
 	 *  @param fence The fence-release that occured prior to this */
@@ -125,6 +128,8 @@ public:
 	bool is_conflicting_lock(const ModelAction *act) const;
 	bool could_synchronize_with(const ModelAction *act) const;
 
+	Thread * get_thread_operand() const;
+
 	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
 	bool synchronize_with(const ModelAction *act);
@@ -146,6 +151,8 @@ public:
 	bool get_sleep_flag() { return sleep_flag; }
 	unsigned int hash() const;
 
+	bool equals(const ModelAction *x) const { return this == x; }
+	bool equals(const Promise *x) const { return false; }
 	MEMALLOC
 private:
 
@@ -167,6 +174,9 @@ private:
 	/** The action that this action reads from. Only valid for reads */
 	const ModelAction *reads_from;
 
+	/** The promise that this action reads from. Only valid for reads */
+	const Promise *reads_from_promise;
+
 	/** The last fence release from the same thread */
 	const ModelAction *last_fence_release;
 
@@ -183,6 +193,4 @@ private:
 	bool sleep_flag;
 };
 
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
 #endif /* __ACTION_H__ */