#include <ucontext.h>
#include <stdint.h>
+#include <vector>
#include "mymemory.h"
#include "libthreads.h"
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;
/** @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 thread to the waiting list for this thread.
+ * @param t The Thread to add
+ */
+ void push_wait_list(Thread *t) { wait_list.push_back(t); }
+
+ /**
+ * Remove one Thread from the waiting list
+ * @return The Thread that was removed from the waiting list
+ */
+ Thread * pop_wait_list() {
+ Thread *ret = wait_list.front();
+ wait_list.pop_back();
+ return ret;
+ }
+
friend void thread_startup();
SNAPSHOTALLOC
thread_id_t id;
thread_state state;
+ /**
+ * A list of Threads waiting on this Thread. Particularly, this list is
+ * used for thread joins, where another Thread waits for this Thread to
+ * complete
+ */
+ std::vector<Thread *> wait_list;
+
/**
* The value returned by the last action in this thread
* @see Thread::set_return_value()