X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=7c79f435cff8aba9b248fba38af5ee40b8aac84c;hp=4eb1f7ed19799943b3cf906e4f0a1a2017f1a95d;hb=c758f1b28c3c5335ab80b9fd0699e0e6dd887f23;hpb=9e899821b7500371dbe61975ccbc64e42e82ef83

diff --git a/action.h b/action.h
index 4eb1f7ed..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
@@ -202,7 +204,7 @@ private:
 	/** @brief The last fence release from the same thread */
 	const ModelAction *last_fence_release;
 	ModelAction * uninitaction;
-	
+
 	/**
 	 * @brief The clock vector for this operation
 	 *
@@ -212,7 +214,7 @@ private:
 	 */
 	ClockVector *cv;
 	ClockVector *rf_cv;
-	
+
 	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;