More bug fixes

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 15bb02ea5dec0a686570bffd8d13e552a37248d5..2b4b4141da042161dfe1db76f7b4573339b92001 100644 (file)
--- a/action.h
+++ b/action.h
@@ -58,7 +58,6 @@ typedef enum action_type {
        PTHREAD_CREATE, // < A pthread creation action
        PTHREAD_JOIN,   // < A pthread join action
 
-       ATOMIC_UNINIT,  // < Represents an uninitialized atomic
        NONATOMIC_WRITE,        // < Represents a non-atomic store
        ATOMIC_INIT,    // < Initialization of an atomic object (e.g., atomic_init())
        ATOMIC_WRITE,   // < An atomic write action
@@ -78,6 +77,7 @@ typedef enum action_type {
        ATOMIC_WAIT,    // < A wait action
        ATOMIC_TIMEDWAIT,       // < A timed wait action
        ATOMIC_ANNOTATION,      // < An annotation action to pass information to a trace analysis
+       READY_FREE
 } action_type_t;
 
 
@@ -85,8 +85,8 @@ typedef enum action_type {
  * @brief Represents a single atomic action
  *
  * A ModelAction is always allocated as non-snapshotting, because it is used in
- * multiple executions during backtracking. Except for fake uninitialized
- * (ATOMIC_UNINIT) ModelActions, each action is assigned a unique sequence
+ * multiple executions during backtracking. Except for non-atomic write
+ * ModelActions, each action is assigned a unique sequence
  * number.
  */
 class ModelAction {
@@ -101,6 +101,7 @@ public:
 
        thread_id_t get_tid() const { return tid; }
        action_type get_type() const { return type; }
+       void set_free() { type = READY_FREE; }
        memory_order get_mo() const { return order; }
        memory_order get_original_mo() const { return original_order; }
        void set_mo(memory_order order) { this->order = order; }
@@ -135,14 +136,15 @@ public:
        bool is_trylock() const;
        bool is_unlock() const;
        bool is_wait() const;
+       bool is_create() const;
        bool is_notify() const;
        bool is_notify_one() const;
        bool is_success_lock() const;
        bool is_failed_trylock() const;
        bool is_atomic_var() const;
-       bool is_uninitialized() const;
        bool is_read() const;
        bool is_write() const;
+       bool is_free() const;
        bool is_yield() const;
        bool could_be_write() const;
        bool is_rmwr() const;
@@ -187,11 +189,12 @@ 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; }
        void setTraceRef(sllnode<ModelAction *> *ref) { trace_ref = ref; }
        void setThrdMapRef(sllnode<ModelAction *> *ref) { thrdmap_ref = ref; }
        void setActionRef(sllnode<ModelAction *> *ref) { action_ref = ref; }
+       sllnode<ModelAction *> * getTraceRef() { return trace_ref; }
+       sllnode<ModelAction *> * getThrdMapRef() { return thrdmap_ref; }
+       sllnode<ModelAction *> * getActionRef() { return action_ref; }
        SNAPSHOTALLOC
 private:
        const char * get_type_str() const;
@@ -216,7 +219,6 @@ private:
 
        /** @brief The last fence release from the same thread */
        const ModelAction *last_fence_release;
-       ModelAction * uninitaction;
 
        /**
         * @brief The clock vector for this operation
@@ -250,7 +252,7 @@ private:
        /**
         * @brief The sequence number of this action
         *
-        * Except for ATOMIC_UNINIT actions, this number should be unique and
+        * Except for non atomic write actions, this number should be unique and
         * should represent the action's position in the execution order.
         */
        modelclock_t seq_number;