swapcontext() fix for Mac OSX

[c11tester.git] / threads-model.h

diff --git a/threads-model.h b/threads-model.h
index e77e80cc71de39663fd4078307c7c2220fee68a6..5fc6d675aba6a9f05b132ded2ad2aed0ad6250d5 100644 (file)
--- a/threads-model.h
+++ b/threads-model.h
@@ -5,13 +5,13 @@
 #ifndef __THREADS_MODEL_H__
 #define __THREADS_MODEL_H__
 
-#include <ucontext.h>
 #include <stdint.h>
 
 #include "mymemory.h"
 #include <threads.h>
 #include "modeltypes.h"
 #include "stl-model.h"
+#include "context.h"
 
 struct thread_params {
        thrd_start_t func;
@@ -78,23 +78,6 @@ public:
        /** @return True if this thread is blocked */
        bool is_blocked() const { return state == THREAD_BLOCKED; }
 
-       /** @return True if no threads are waiting on this Thread */
-       bool wait_list_empty() const { return wait_list.empty(); }
-
-       /**
-        * 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() const {
-               return wait_list.size();
-       }
-
-       ModelAction * get_waiter(unsigned int i) const {
-               return wait_list[i];
-       }
-
        /** @return The pending (next) ModelAction for this Thread
         *  @see Thread::pending */
        ModelAction * get_pending() const { return pending; }
@@ -105,16 +88,7 @@ public:
        void set_pending(ModelAction *act) { pending = act; }
 
        Thread * waiting_on() const;
-
-       /**
-        * 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_waiting_on(const Thread *t) const;
 
        bool is_model_thread() const { return model_thread; }
 
@@ -126,6 +100,18 @@ 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();
 
@@ -152,13 +138,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
-        */
-       SnapVector<ModelAction *> wait_list;
-
        /**
         * The value returned by the last action in this thread
         * @see Thread::set_return_value()