X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=threads-model.h;h=02f20b030778420d46a247e7a3980f34bf20396b;hp=e77e80cc71de39663fd4078307c7c2220fee68a6;hb=fa4c0d65d9c72d08d28e604a3eaa2fd82a9c6b20;hpb=5ea8e3d5d861ed363e5ac5f3b20b8181dd197efb

diff --git a/threads-model.h b/threads-model.h
index e77e80cc..02f20b03 100644
--- a/threads-model.h
+++ b/threads-model.h
@@ -5,13 +5,14 @@
 #ifndef __THREADS_MODEL_H__
 #define __THREADS_MODEL_H__
 
-#include <ucontext.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"
 
 struct thread_params {
 	thrd_start_t func;
@@ -35,13 +36,14 @@ typedef enum thread_state {
 	THREAD_COMPLETED
 } thread_state;
 
-class ModelAction;
 
 /** @brief A Thread is created for each user-space thread */
 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();
 
@@ -72,29 +74,16 @@ public:
 	 */
 	uint64_t get_return_value() const { return last_action_val; }
 
+	/** @set and get the return value from pthread functions */
+	void set_pthread_return(void *ret) { pthread_return = ret; }
+	void * get_pthread_return() { return pthread_return; }
+
 	/** @return True if this thread is finished executing */
 	bool is_complete() const { return state == THREAD_COMPLETED; }
 
 	/** @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 +94,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 +106,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();
 
@@ -145,6 +137,8 @@ private:
 	ModelAction *pending;
 
 	void (*start_routine)(void *);
+	void *(*pstart_routine)(void *);
+
 	void *arg;
 	ucontext_t context;
 	void *stack;
@@ -152,13 +146,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()
@@ -166,11 +153,15 @@ private:
 	 */
 	uint64_t last_action_val;
 
+	/** the value return from pthread functions */
+	void * pthread_return;
+
 	/** @brief Is this Thread a special model-checker thread? */
 	const bool model_thread;
 };
 
 Thread * thread_current();
+void thread_startup();
 
 static inline thread_id_t thrd_to_id(thrd_t t)
 {
@@ -197,4 +188,4 @@ static inline int id_to_int(thread_id_t id)
 	return id;
 }
 
-#endif /* __THREADS_MODEL_H__ */
+#endif	/* __THREADS_MODEL_H__ */