small changes

[c11tester.git] / threads-model.h

diff --git a/threads-model.h b/threads-model.h
index 752731e246adc93c9ecaa6a03fef22471f04f77c..15dd151577e908027f002565cf2855e95c85d787 100644 (file)
--- a/threads-model.h
+++ b/threads-model.h
@@ -6,12 +6,13 @@
 #define __THREADS_MODEL_H__
 
 #include <stdint.h>
-
 #include "mymemory.h"
-#include <threads.h>
+#include "threads.h"
 #include "modeltypes.h"
 #include "stl-model.h"
 #include "context.h"
+#include "classlist.h"
+#include "pthread.h"
 
 struct thread_params {
        thrd_start_t func;
@@ -32,10 +33,10 @@ typedef enum thread_state {
         */
        THREAD_BLOCKED,
        /** Thread has completed its execution */
-       THREAD_COMPLETED
+       THREAD_COMPLETED,
+       THREAD_FREED
 } thread_state;
 
-class ModelAction;
 
 /** @brief A Thread is created for each user-space thread */
 class Thread {
@@ -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; }
@@ -93,12 +99,23 @@ public:
         *  @see Thread::pending */
        void set_pending(ModelAction *act) { pending = act; }
 
+       bool just_woken_up() { return wakeup_state; }
+       void set_wakeup_state(bool state) { wakeup_state = state; }
+
        Thread * waiting_on() const;
        bool is_waiting_on(const Thread *t) const;
 
        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
+       friend void setup_context();
+       friend void * helper_thread(void *);
+       friend void finalize_helper_thread();
+#endif
 
        /**
         * Intentionally NOT allocated with MODELALLOC or SNAPSHOTALLOC.
@@ -118,12 +135,18 @@ public:
        void operator delete[](void *p, size_t size) {
                Thread_free(p);
        }
+#ifdef TLS
+       void setTLS(char *_tls) { tls = _tls;}
+#endif
 private:
        int create_context();
 
        /** @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;
 
@@ -136,12 +159,26 @@ private:
         */
        ModelAction *pending;
 
+       /** @brief True if this thread was just woken up */
+       bool wakeup_state;
+
        void (*start_routine)(void *);
        void *(*pstart_routine)(void *);
 
        void *arg;
        ucontext_t context;
        void *stack;
+       uint32_t stack_size;
+#ifdef TLS
+       void * helper_stack;
+public:
+       char *tls;
+       ucontext_t helpercontext;
+       pthread_mutex_t mutex;
+       pthread_mutex_t mutex2;
+       pthread_t thread;
+private:
+#endif
        thrd_t *user_thread;
        thread_id_t id;
        thread_state state;
@@ -160,7 +197,15 @@ private:
        const bool model_thread;
 };
 
+#ifdef TLS
+uintptr_t get_tls_addr();
+void tlsdestructor(void *v);
+#endif
+
 Thread * thread_current();
+thread_id_t thread_current_id();
+void thread_startup();
+void initMainThread();
 
 static inline thread_id_t thrd_to_id(thrd_t t)
 {
@@ -187,4 +232,12 @@ static inline int id_to_int(thread_id_t id)
        return id;
 }
 
-#endif /* __THREADS_MODEL_H__ */
+int real_pthread_mutex_init(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr);
+int real_pthread_mutex_lock (pthread_mutex_t *__mutex);
+int real_pthread_mutex_unlock (pthread_mutex_t *__mutex);
+int real_pthread_create (pthread_t *__restrict __newthread, const pthread_attr_t *__restrict __attr, void *(*__start_routine)(void *), void *__restrict __arg);
+int real_pthread_join (pthread_t __th, void ** __thread_return);
+void real_pthread_exit (void * value_ptr) __attribute__((noreturn));
+void real_init_all();
+
+#endif /* __THREADS_MODEL_H__ */