X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=7c79f435cff8aba9b248fba38af5ee40b8aac84c;hb=c87eadb9d625748d6bfc00df9195f851d791d96a;hp=c7703094d99ffe12213ec59a44b8c9ef0fdcc7a3;hpb=c44681494532fc9b3cec1e9148324025a635017b;p=c11tester.git

diff --git a/action.h b/action.h
index c7703094..7c79f435 100644
--- a/action.h
+++ b/action.h
@@ -55,13 +55,15 @@ typedef enum action_type {
 	PTHREAD_CREATE,	// < A pthread creation action
 	PTHREAD_JOIN,	// < A pthread join action
 	ATOMIC_UNINIT,	// < Represents an uninitialized atomic
-	ATOMIC_READ,	// < An atomic read action
+	NONATOMIC_WRITE,	// < Represents a non-atomic store
+	ATOMIC_INIT,	// < Initialization of an atomic object (e.g., atomic_init())
 	ATOMIC_WRITE,	// < An atomic write action
+	ATOMIC_RMW,	// < The write part of an atomic RMW action
+	ATOMIC_READ,	// < An atomic read action
 	ATOMIC_RMWR,	// < The read part of an atomic RMW action
 	ATOMIC_RMWRCAS,	// < The read part of an atomic RMW action
-	ATOMIC_RMW,	// < The write part of an atomic RMW action
 	ATOMIC_RMWC,	// < Convert an atomic RMW action into a READ
-	ATOMIC_INIT,	// < Initialization of an atomic object (e.g., atomic_init())
+
 	ATOMIC_FENCE,	// < A fence action
 	ATOMIC_LOCK,	// < A lock action
 	ATOMIC_TRYLOCK,	// < A trylock action
@@ -103,13 +105,10 @@ public:
 	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; }
+	ModelAction * get_reads_from() const { return reads_from; }
 	cdsc::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(ModelAction *act);
 
 	/** Store the most recent fence-release from the same thread
 	 *  @param fence The fence-release that occured prior to this */
@@ -156,6 +155,8 @@ public:
 	Thread * get_thread_operand() const;
 	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
+	ClockVector * get_rfcv() const { return rf_cv; }
+	void set_rfcv(ClockVector * rfcv) { rf_cv = rfcv; }
 	bool synchronize_with(const ModelAction *act);
 
 	bool has_synchronized_with(const ModelAction *act) const;
@@ -177,6 +178,8 @@ public:
 	/* to accomodate pthread create and join */
 	Thread * thread_operand;
 	void set_thread_operand(Thread *th) { thread_operand = th; }
+	void set_uninit_action(ModelAction *act) { uninitaction = act; }
+	ModelAction * get_uninit_action() { return uninitaction; }
 	SNAPSHOTALLOC
 private:
 	const char * get_type_str() const;
@@ -194,20 +197,13 @@ private:
 		 *
 		 * Only valid for reads
 		 */
-		const ModelAction *reads_from;
+		ModelAction *reads_from;
 		int size;
 	};
 
 	/** @brief The last fence release from the same thread */
 	const ModelAction *last_fence_release;
-
-	/**
-	 * @brief A back reference to a Node in NodeStack
-	 *
-	 * Only set if this ModelAction is saved on the NodeStack. (A
-	 * ModelAction can be thrown away before it ever enters the NodeStack.)
-	 */
-	Node *node;
+	ModelAction * uninitaction;
 
 	/**
 	 * @brief The clock vector for this operation
@@ -217,6 +213,7 @@ private:
 	 * vectors for all operations.
 	 */
 	ClockVector *cv;
+	ClockVector *rf_cv;
 
 	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;