X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=7c9146fdda694adfd97c7f932f75822e53a4303c;hp=21fed0c16950195e1692af65db0d540b960b9b7d;hb=ddb5900f2e0dbde556fd320960f048965cf4f2c2;hpb=a4090d03cc1a5f5bca8f10986d74b76a9bb45371

diff --git a/action.h b/action.h
index 21fed0c1..7c9146fd 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;
@@ -24,12 +25,10 @@ using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
 
 /** Note that this value can be legitimately used by a program, and
-		hence by iteself does not indicate no value. */
-
+ *  hence by iteself does not indicate no value. */
 #define VALUE_NONE 0xdeadbeef
 
 /** A special value to represent a successful trylock */
-
 #define VALUE_TRYSUCCESS 1
 
 /** A special value to represent a failed trylock */
@@ -45,6 +44,7 @@ typedef enum action_type {
 	THREAD_YIELD,         /**< A thread yield action */
 	THREAD_JOIN,          /**< A thread join action */
 	THREAD_FINISH,        /**< A thread completion action */
+	ATOMIC_UNINIT,        /**< Represents an uninitialized atomic */
 	ATOMIC_READ,          /**< An atomic read action */
 	ATOMIC_WRITE,         /**< An atomic write action */
 	ATOMIC_RMWR,          /**< The read part of an atomic RMW action */
@@ -80,21 +80,39 @@ 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;
 	const ModelAction * get_reads_from() const { return reads_from; }
+	Promise * get_reads_from_promise() const { return reads_from_promise; }
 
-	Node * get_node() const { return node; }
+	Node * get_node() const;
 	void set_node(Node *n) { node = n; }
 
+	void set_read_from(const ModelAction *act);
+	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 */
+	void set_last_fence_release(const ModelAction *fence) { last_fence_release = fence; }
+	/** @return The most recent fence-release from the same thread */
+	const ModelAction * get_last_fence_release() const { return last_fence_release; }
+
 	void copy_from_new(ModelAction *newaction);
 	void set_seq_number(modelclock_t num);
 	void set_try_lock(bool obtainedlock);
+	bool is_thread_start() const;
 	bool is_relseq_fixup() const;
 	bool is_mutex_op() const;
 	bool is_lock() const;
 	bool is_trylock() const;
 	bool is_unlock() const;
+	bool is_wait() const;
+	bool is_notify() const;
+	bool is_notify_one() const;
 	bool is_success_lock() const;
 	bool is_failed_trylock() const;
+	bool is_atomic_var() const;
+	bool is_uninitialized() const;
 	bool is_read() const;
 	bool is_write() const;
 	bool could_be_write() const;
@@ -103,6 +121,7 @@ public:
 	bool is_rmw() const;
 	bool is_fence() const;
 	bool is_initialization() const;
+	bool is_relaxed() const;
 	bool is_acquire() const;
 	bool is_release() const;
 	bool is_seqcst() const;
@@ -111,9 +130,10 @@ 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 read_from(const ModelAction *act);
 	bool synchronize_with(const ModelAction *act);
 
 	bool has_synchronized_with(const ModelAction *act) const;
@@ -133,6 +153,11 @@ 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; }
+
+	bool may_read_from(const ModelAction *write) const;
+	bool may_read_from(const Promise *promise) const;
 	MEMALLOC
 private:
 
@@ -154,6 +179,12 @@ 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 */
+	Promise *reads_from_promise;
+
+	/** The last fence release from the same thread */
+	const ModelAction *last_fence_release;
+
 	/** A back reference to a Node in NodeStack, if this ModelAction is
 	 * saved on the NodeStack. */
 	Node *node;
@@ -167,6 +198,4 @@ private:
 	bool sleep_flag;
 };
 
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
 #endif /* __ACTION_H__ */