Change the implementation of sleep and remove NOOP

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 5862485b7e54b58a70ac10e0800be70f23548c33..8a7743ff7f2c5cac90413d5e96ff137a2817f1c5 100644 (file)
--- a/action.h
+++ b/action.h
@@ -52,25 +52,32 @@ typedef enum action_type {
        THREAD_YIELD,   // < A thread yield action
        THREAD_JOIN,    // < A thread join action
        THREAD_FINISH,  // < A thread completion action
+       THREADONLY_FINISH,      // < A thread completion action
+       THREAD_SLEEP,   // < A sleep operation
+
        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
        ATOMIC_UNLOCK,  // < An unlock action
+
        ATOMIC_NOTIFY_ONE,      // < A notify_one action
        ATOMIC_NOTIFY_ALL,      // < A notify all action
        ATOMIC_WAIT,    // < A wait action
+       ATOMIC_TIMEDWAIT,       // < A timed wait action
        ATOMIC_ANNOTATION,      // < An annotation action to pass information to a trace analysis
-       NOOP    // no operation, which returns control to scheduler
 } action_type_t;
 
 
@@ -87,6 +94,7 @@ public:
        ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
        ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, int size);
        ModelAction(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value, int size);
+       ModelAction(action_type_t type, memory_order order, uint64_t value, uint64_t time);
        ModelAction(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
        ~ModelAction();
        void print() const;
@@ -104,6 +112,7 @@ public:
        uint64_t get_write_value() const;
        uint64_t get_return_value() const;
        ModelAction * get_reads_from() const { return reads_from; }
+       uint64_t get_time() const {return time;}
        cdsc::mutex * get_mutex() const;
 
        void set_read_from(ModelAction *act);
@@ -116,11 +125,13 @@ public:
 
        void copy_from_new(ModelAction *newaction);
        void set_seq_number(modelclock_t num);
+       void reset_seq_number();
        void set_try_lock(bool obtainedlock);
        bool is_thread_start() const;
        bool is_thread_join() const;
        bool is_mutex_op() const;
        bool is_lock() const;
+       bool is_sleep() const;
        bool is_trylock() const;
        bool is_unlock() const;
        bool is_wait() const;
@@ -197,6 +208,7 @@ private:
                 */
                ModelAction *reads_from;
                int size;
+               uint64_t time;  //used for sleep
        };
 
        /** @brief The last fence release from the same thread */