fix mutex_trylock bug

[c11tester.git] / threads-model.h

diff --git a/threads-model.h b/threads-model.h
index e159697d9d54ce10c3cfb1fe204352a9e0bd7435..15dd151577e908027f002565cf2855e95c85d787 100644 (file)
--- a/threads-model.h
+++ b/threads-model.h
@@ -33,7 +33,8 @@ typedef enum thread_state {
         */
        THREAD_BLOCKED,
        /** Thread has completed its execution */
-       THREAD_COMPLETED
+       THREAD_COMPLETED,
+       THREAD_FREED
 } thread_state;
 
 
@@ -46,9 +47,11 @@ public:
 
        ~Thread();
        void complete();
+       void freeResources();
 
        static int swap(ucontext_t *ctxt, Thread *t);
        static int swap(Thread *t, ucontext_t *ctxt);
+       static int swap(Thread *t, Thread *t2);
 
        thread_state get_state() const { return state; }
        void set_state(thread_state s);
@@ -79,7 +82,10 @@ public:
        void * get_pthread_return() { return pthread_return; }
 
        /** @return True if this thread is finished executing */
-       bool is_complete() const { return state == THREAD_COMPLETED; }
+       bool is_complete() const { return state == THREAD_COMPLETED || state == THREAD_FREED; }
+
+       /** @return True if this thread has finished and its resources have been freed */
+       bool is_freed() const { return state == THREAD_FREED; }
 
        /** @return True if this thread is blocked */
        bool is_blocked() const { return state == THREAD_BLOCKED; }
@@ -102,6 +108,7 @@ public:
        bool is_model_thread() const { return model_thread; }
 
        void * get_stack_addr() { return stack; }
+       ClockVector * get_acq_fence_cv() { return acq_fence_cv; }
 
        friend void thread_startup();
 #ifdef TLS
@@ -137,6 +144,9 @@ private:
        /** @brief The parent Thread which created this Thread */
        Thread * const parent;
 
+       /** @brief Acquire fence cv */
+       ClockVector *acq_fence_cv;
+
        /** @brief The THREAD_CREATE ModelAction which created this Thread */
        ModelAction *creation;
 
@@ -193,6 +203,7 @@ void tlsdestructor(void *v);
 #endif
 
 Thread * thread_current();
+thread_id_t thread_current_id();
 void thread_startup();
 void initMainThread();