X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=abf55318cd3ba379ea198420fad4ce70bfc570ea;hb=d225d983eb6b52f032fcdc54b7dc612cd4e061fb;hp=c39af5ecdb177aff649eb79ba39eb3eff1b3253c;hpb=9aae08ba6d60aa253039d2da1c3571fdde2ac159;p=model-checker.git

diff --git a/action.h b/action.h
index c39af5e..abf5531 100644
--- a/action.h
+++ b/action.h
@@ -5,7 +5,6 @@
 #ifndef __ACTION_H__
 #define __ACTION_H__
 
-#include <list>
 #include <cstddef>
 #include <inttypes.h>
 
@@ -17,6 +16,10 @@ class ClockVector;
 class Thread;
 class Promise;
 
+namespace std {
+	class mutex;
+}
+
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_acquire;
@@ -80,14 +83,18 @@ public:
 	void * get_location() const { return location; }
 	modelclock_t get_seq_number() const { return seq_number; }
 	uint64_t get_value() const { return value; }
+	uint64_t get_reads_from_value() const;
+	uint64_t get_write_value() const;
+	uint64_t get_return_value() const;
 	const ModelAction * get_reads_from() const { return reads_from; }
-	const Promise * get_reads_from_promise() const { return reads_from_promise; }
+	Promise * get_reads_from_promise() const { return reads_from_promise; }
+	std::mutex * get_mutex() const;
 
 	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);
+	void set_read_from_promise(Promise *promise);
 
 	/** Store the most recent fence-release from the same thread
 	 *  @param fence The fence-release that occured prior to this */
@@ -99,6 +106,7 @@ public:
 	void set_seq_number(modelclock_t num);
 	void set_try_lock(bool obtainedlock);
 	bool is_thread_start() const;
+	bool is_thread_join() const;
 	bool is_relseq_fixup() const;
 	bool is_mutex_op() const;
 	bool is_lock() const;
@@ -113,6 +121,7 @@ public:
 	bool is_uninitialized() const;
 	bool is_read() const;
 	bool is_write() const;
+	bool is_yield() const;
 	bool could_be_write() const;
 	bool is_rmwr() const;
 	bool is_rmwc() const;
@@ -153,6 +162,9 @@ public:
 
 	bool equals(const ModelAction *x) const { return this == x; }
 	bool equals(const Promise *x) const { return false; }
+
+	bool may_read_from(const ModelAction *write) const;
+	bool may_read_from(const Promise *promise) const;
 	MEMALLOC
 private:
 
@@ -175,7 +187,7 @@ private:
 	const ModelAction *reads_from;
 
 	/** The promise that this action reads from. Only valid for reads */
-	const Promise *reads_from_promise;
+	Promise *reads_from_promise;
 
 	/** The last fence release from the same thread */
 	const ModelAction *last_fence_release;
@@ -193,6 +205,4 @@ private:
 	bool sleep_flag;
 };
 
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
 #endif /* __ACTION_H__ */