add a new thread constructor for pthread

[c11tester.git] / threads-model.h

diff --git a/threads-model.h b/threads-model.h
index b99b279b8ece6cccc916f227d228464112967254..11f2d547233119dc165d86eb62f0de8a5f438df5 100644 (file)
--- a/threads-model.h
+++ b/threads-model.h
@@ -5,13 +5,18 @@
 #ifndef __THREADS_MODEL_H__
 #define __THREADS_MODEL_H__
 
-#include <ucontext.h>
 #include <stdint.h>
-#include <vector>
 
 #include "mymemory.h"
 #include <threads.h>
 #include "modeltypes.h"
+#include "stl-model.h"
+#include "context.h"
+
+struct thread_params {
+       thrd_start_t func;
+       void *arg;
+};
 
 /** @brief Represents the state of a user Thread */
 typedef enum thread_state {
@@ -36,21 +41,22 @@ class ModelAction;
 class Thread {
 public:
        Thread(thread_id_t tid);
-       Thread(thrd_t *t, void (*func)(void *), void *a);
+       Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent);
+       Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent);
        ~Thread();
        void complete();
 
        static int swap(ucontext_t *ctxt, Thread *t);
        static int swap(Thread *t, ucontext_t *ctxt);
 
-       thread_state get_state() { return state; }
-       void set_state(thread_state s) { state = s; }
-       thread_id_t get_id();
-       thrd_t get_thrd_t() { return *user_thread; }
-       Thread * get_parent() { return parent; }
+       thread_state get_state() const { return state; }
+       void set_state(thread_state s);
+       thread_id_t get_id() const;
+       thrd_t get_thrd_t() const { return *user_thread; }
+       Thread * get_parent() const { return parent; }
 
        void set_creation(ModelAction *act) { creation = act; }
-       ModelAction * get_creation() { return creation; }
+       ModelAction * get_creation() const { return creation; }
 
        /**
         * Set a return value for the last action in this thread (e.g., for an
@@ -65,44 +71,27 @@ public:
         * be called from a user context.
         * @return The value 'returned' by the action
         */
-       uint64_t get_return_value() { return last_action_val; }
+       uint64_t get_return_value() const { return last_action_val; }
 
        /** @return True if this thread is finished executing */
-       bool is_complete() { return state == THREAD_COMPLETED; }
+       bool is_complete() const { return state == THREAD_COMPLETED; }
 
        /** @return True if this thread is blocked */
-       bool is_blocked() { return state == THREAD_BLOCKED; }
+       bool is_blocked() const { return state == THREAD_BLOCKED; }
 
-       /** @return True if no threads are waiting on this Thread */
-       bool wait_list_empty() { return wait_list.empty(); }
+       /** @return The pending (next) ModelAction for this Thread
+        *  @see Thread::pending */
+       ModelAction * get_pending() const { return pending; }
 
-       /**
-        * Add a ModelAction to the waiting list for this thread.
-        * @param t The ModelAction to add. Must be a JOIN.
-        */
-       void push_wait_list(ModelAction *act) { wait_list.push_back(act); }
-
-       unsigned int num_wait_list() {
-               return wait_list.size();
-       }
-
-       ModelAction * get_waiter(unsigned int i) {
-               return wait_list[i];
-       }
-
-       ModelAction * get_pending() { return pending; }
+       /** @brief Set the pending (next) ModelAction for this Thread
+        *  @param act The pending ModelAction
+        *  @see Thread::pending */
        void set_pending(ModelAction *act) { pending = act; }
-       /**
-        * Remove one ModelAction from the waiting list
-        * @return The ModelAction that was removed from the waiting list
-        */
-       ModelAction * pop_wait_list() {
-               ModelAction *ret = wait_list.front();
-               wait_list.pop_back();
-               return ret;
-       }
 
-       bool is_model_thread() { return model_thread; }
+       Thread * waiting_on() const;
+       bool is_waiting_on(const Thread *t) const;
+
+       bool is_model_thread() const { return model_thread; }
 
        friend void thread_startup();
 
@@ -112,13 +101,38 @@ public:
         * to allow their allocation/deallocation to follow the same pattern as
         * the rest of the backtracked/replayed program.
         */
+       void * operator new(size_t size) {
+               return Thread_malloc(size);
+       }
+       void operator delete(void *p, size_t size) {
+               Thread_free(p);
+       }
+       void * operator new[](size_t size) {
+               return Thread_malloc(size);
+       }
+       void operator delete[](void *p, size_t size) {
+               Thread_free(p);
+       }
 private:
        int create_context();
-       Thread *parent;
+
+       /** @brief The parent Thread which created this Thread */
+       Thread * const parent;
+
+       /** @brief The THREAD_CREATE ModelAction which created this Thread */
        ModelAction *creation;
 
+       /**
+        * @brief The next ModelAction to be run by this Thread
+        *
+        * This action should be kept updated by the ModelChecker, so that we
+        * always know what the next ModelAction's memory_order, action type,
+        * and location are.
+        */
        ModelAction *pending;
+
        void (*start_routine)(void *);
+       void *(*pstart_routine)(void *);
        void *arg;
        ucontext_t context;
        void *stack;
@@ -126,13 +140,6 @@ private:
        thread_id_t id;
        thread_state state;
 
-       /**
-        * A list of ModelActions waiting on this Thread. Particularly, this
-        * list is used for thread joins, where another Thread waits for this
-        * Thread to complete
-        */
-       std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > wait_list;
-
        /**
         * The value returned by the last action in this thread
         * @see Thread::set_return_value()
@@ -148,7 +155,7 @@ Thread * thread_current();
 
 static inline thread_id_t thrd_to_id(thrd_t t)
 {
-       return t;
+       return t.priv->get_id();
 }
 
 /**