#define __THREADS_H__
#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;
* 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,
* 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); }
+
+ /**
+ * 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();
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();