X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=threads.h;h=9456a22f2fe4942b1004a87794fa3474eaeab26b;hp=0f39a836f49efae34c63415f433e37715a43d258;hb=cf29a02731b7257e13cd9f666a920339fe581040;hpb=fb2ab76b04c83faa654c8819c8e39b1e5fcc7d75

diff --git a/threads.h b/threads.h
index 0f39a83..9456a22 100644
--- a/threads.h
+++ b/threads.h
@@ -6,6 +6,9 @@
 #define __THREADS_H__
 
 #include <ucontext.h>
+#include <stdint.h>
+#include <vector>
+
 #include "mymemory.h"
 #include "libthreads.h"
 
@@ -19,12 +22,13 @@ typedef enum thread_state {
 	THREAD_CREATED,
 	/** Thread is running */
 	THREAD_RUNNING,
+	/** Thread is not currently running but is ready to run */
+	THREAD_READY,
 	/**
-	 * Thread has yielded to the model-checker but is ready to run. Used
-	 * during an action that caused a context switch to the model-checking
-	 * context.
+	 * Thread is waiting on another action (e.g., thread completion, lock
+	 * release, etc.)
 	 */
-	THREAD_READY,
+	THREAD_BLOCKED,
 	/** Thread has completed its execution */
 	THREAD_COMPLETED
 } thread_state;
@@ -55,7 +59,7 @@ public:
 	 * atomic read).
 	 * @param value The value to return
 	 */
-	void set_return_value(int value) { last_action_val = value; }
+	void set_return_value(uint64_t value) { last_action_val = value; }
 
 	/**
 	 * Retrieve a return value for the last action in this thread. Used,
@@ -63,7 +67,34 @@ public:
 	 * be called from a user context.
 	 * @return The value 'returned' by the action
 	 */
-	int get_return_value() { return last_action_val; }
+	uint64_t get_return_value() { return last_action_val; }
+
+	/** @return True if this thread is finished executing */
+	bool is_complete() { return state == THREAD_COMPLETED; }
+
+	/** @return True if this thread is blocked */
+	bool is_blocked() { return state == THREAD_BLOCKED; }
+
+	/** @return True if no threads are waiting on this Thread */
+	bool wait_list_empty() { 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); }
+
+	ModelAction * get_pending() { return 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;
+	}
 
 	friend void thread_startup();
 
@@ -73,6 +104,7 @@ private:
 	Thread *parent;
 	ModelAction *creation;
 
+	ModelAction *pending;
 	void (*start_routine)(void *);
 	void *arg;
 	ucontext_t context;
@@ -81,12 +113,19 @@ 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 *> wait_list;
+
 	/**
 	 * The value returned by the last action in this thread
 	 * @see Thread::set_return_value()
 	 * @see Thread::get_return_value()
 	 */
-	int last_action_val;
+	uint64_t last_action_val;
 };
 
 Thread * thread_current();