Merge branch 'branch-weiyu' of /home/git/random-fuzzer into branch-weiyu

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 2ca1429aeffc460878de5cf3c9dc578593051fcd..b0b3d51a78dd361ca127a80e7767743c1de3b49f 100644 (file)
--- a/action.h
+++ b/action.h
@@ -18,7 +18,7 @@ class ClockVector;
 class Thread;
 class Promise;
 
-namespace std {
+namespace cdsc {
        class mutex;
 }
 
@@ -76,8 +76,9 @@ typedef enum action_type {
        ATOMIC_NOTIFY_ONE,    /**< A notify_one action */
        ATOMIC_NOTIFY_ALL,    /**< A notify all action */
        ATOMIC_WAIT,          /**< A wait action */
-       ATOMIC_ANNOTATION     /**< An annotation action to pass information
+       ATOMIC_ANNOTATION,     /**< An annotation action to pass information
                                                                                                         to a trace analysis */
+       NOOP
 } action_type_t;
 
 /* Forward declaration */
@@ -104,7 +105,6 @@ public:
        memory_order get_original_mo() const { return original_order; }
        void set_mo(memory_order order) { this->order = order; }
        void * get_location() const { return location; }
-       void * get_mutex_location() const { return location_mutex; }
        modelclock_t get_seq_number() const { return seq_number; }
        uint64_t get_value() const { return value; }
        uint64_t get_reads_from_value() const;
@@ -112,7 +112,7 @@ public:
        uint64_t get_return_value() const;
        const ModelAction * get_reads_from() const { return reads_from; }
        Promise * get_reads_from_promise() const { return reads_from_promise; }
-       std::mutex * get_mutex() const;
+       cdsc::mutex * get_mutex() const;
 
        Node * get_node() const;
        void set_node(Node *n) { node = n; }
@@ -214,9 +214,6 @@ private:
        /** @brief A pointer to the memory location for this action. */
        void *location;
 
-       /** @brief A pointer to the memory location for mutex. */
-       void *location_mutex;
-
        /** @brief The thread id that performed this action. */
        thread_id_t tid;