X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=threads-model.h;h=11f2d547233119dc165d86eb62f0de8a5f438df5;hp=2cd09ab53739de7d327de3e5758af6b7ba66465d;hb=6475a98e4e3305703004e4ea7417ac93bde51153;hpb=ad52dcdb3a75a69242a392165934e942cb76513b

diff --git a/threads-model.h b/threads-model.h
index 2cd09ab5..11f2d547 100644
--- 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 <vector>
 
 #include "mymemory.h"
 #include <threads.h>
 #include "modeltypes.h"
+#include "stl-model.h"
+#include "context.h"
 
 struct thread_params {
 	thrd_start_t func;
@@ -41,7 +41,8 @@ class ModelAction;
 class Thread {
 public:
 	Thread(thread_id_t tid);
-	Thread(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(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent);
 	~Thread();
 	void complete();
 
@@ -78,23 +79,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; }
@@ -104,15 +88,8 @@ public:
 	 *  @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;
-	}
+	Thread * waiting_on() const;
+	bool is_waiting_on(const Thread *t) const;
 
 	bool is_model_thread() const { return model_thread; }
 
@@ -124,6 +101,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();
 
@@ -143,6 +132,7 @@ private:
 	ModelAction *pending;
 
 	void (*start_routine)(void *);
+	void *(*pstart_routine)(void *);
 	void *arg;
 	ucontext_t context;
 	void *stack;
@@ -150,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()