change the namespace of mutex from std to cdsc

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index f7b66a89fc68482d5b2a0989ab1c88ec966ad5d7..8f44c7cb9776d895bbb3579dfa7732e3c0964077 100644 (file)
--- a/action.h
+++ b/action.h
@@ -11,13 +11,14 @@
 #include "mymemory.h"
 #include "memoryorder.h"
 #include "modeltypes.h"
+#include "pthread.h"
 
 /* Forward declarations */
 class ClockVector;
 class Thread;
 class Promise;
 
-namespace std {
+namespace cdsc {
        class mutex;
 }
 
@@ -59,6 +60,7 @@ typedef enum action_type {
        THREAD_FINISH,        /**< A thread completion action */
        PTHREAD_CREATE,       /**< A pthread creation action */
        PTHREAD_JOIN,         /**< A pthread join action */
+       
        ATOMIC_UNINIT,        /**< Represents an uninitialized atomic */
        ATOMIC_READ,          /**< An atomic read action */
        ATOMIC_WRITE,         /**< An atomic write action */
@@ -109,7 +111,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; }
@@ -189,10 +191,11 @@ public:
        bool may_read_from(const Promise *promise) const;
        MEMALLOC
 
-// Added by WL
-       void set_value(uint64_t val) {
-               value = val;
-       }
+       void set_value(uint64_t val) { value = val; }
+
+       /* to accomodate pthread create and join */
+       Thread * thread_operand;
+       void set_thread_operand(Thread *th) { thread_operand = th; } 
 private:
 
        const char * get_type_str() const;