X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=action.h;h=ffe60dc5e8e9a33e18a59123c77d6a6fa09f505b;hp=8d06aa49269bd6747f5353307a91e1b15ac63cb2;hb=88ccfdff63126a0fa70c094c7ed7e66f68e1b861;hpb=247e28f81f258c3c380be00a89430186f8ac11ed

diff --git a/action.h b/action.h
index 8d06aa4..ffe60dc 100644
--- a/action.h
+++ b/action.h
@@ -34,9 +34,9 @@ typedef enum action_type {
 	THREAD_JOIN,          /**< A thread join action */
 	ATOMIC_READ,          /**< An atomic read action */
 	ATOMIC_WRITE,         /**< An atomic write action */
-	ATOMIC_RMWR,          /**< The read of an atomic read-modify-write action */
-	ATOMIC_RMW,           /**< The write of an atomic read-modify-write action */
-	ATOMIC_RMWC,          /**< Terminate an atomic read-modify-write action w/o write */
+	ATOMIC_RMWR,          /**< 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()) */
 } action_type_t;
@@ -96,6 +96,7 @@ public:
 
 	MEMALLOC
 private:
+	void synchronize_with(const ModelAction *act);
 
 	/** Type of action (read, write, thread create, thread yield, thread join) */
 	action_type type;