changes

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 5ab36b360ffd0bd3889f456a53e61f6c9cfe7712..7c457076501f77f93550da6fe629e2e625a0f2cb 100644 (file)
--- 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;
@@ -81,6 +81,8 @@ public:
        void create_cv(const ModelAction *parent = NULL);
        ClockVector * get_cv() const { return cv; }
        void read_from(const ModelAction *act);
+       void synchronized(const ModelAction *act);
+
 
        bool happens_before(const ModelAction *act) const;
 
@@ -91,7 +93,8 @@ public:
                return get_seq_number() > act.get_seq_number();
        }
 
-       void upgrade_rmw(ModelAction * act);
+       void process_rmw(ModelAction * act);
+       void copy_typeandorder(ModelAction * act);
 
        MEMALLOC
 private: