#include "mymemory.h"
#include "libthreads.h"
-
-typedef int thread_id_t;
-
-#define THREAD_ID_T_NONE -1
+#include "modeltypes.h"
/** @brief Represents the state of a user Thread */
typedef enum thread_state {
/** @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();
void complete();
bool wait_list_empty() { return wait_list.empty(); }
/**
- * Add a thread to the waiting list for this thread.
- * @param t The Thread to add
+ * Add a ModelAction to the waiting list for this thread.
+ * @param t The ModelAction to add. Must be a JOIN.
*/
- void push_wait_list(Thread *t) { wait_list.push_back(t); }
+ void push_wait_list(ModelAction *act) { wait_list.push_back(act); }
+
+ unsigned int num_wait_list() {
+ return wait_list.size();
+ }
+ ModelAction * get_waiter(unsigned int i) {
+ return wait_list[i];
+ }
+
+ ModelAction * get_pending() { return pending; }
+ void set_pending(ModelAction *act) { pending = act; }
/**
- * Remove one Thread from the waiting list
- * @return The Thread that was removed from the waiting list
+ * Remove one ModelAction from the waiting list
+ * @return The ModelAction that was removed from the waiting list
*/
- Thread * pop_wait_list() {
- Thread *ret = wait_list.front();
+ ModelAction * pop_wait_list() {
+ ModelAction *ret = wait_list.front();
wait_list.pop_back();
return ret;
}
+ bool is_model_thread() { return model_thread; }
+
friend void thread_startup();
SNAPSHOTALLOC
Thread *parent;
ModelAction *creation;
+ ModelAction *pending;
void (*start_routine)(void *);
void *arg;
ucontext_t context;
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
+ * 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<Thread *> wait_list;
+ std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > wait_list;
/**
* The value returned by the last action in this thread
* @see Thread::get_return_value()
*/
uint64_t last_action_val;
+
+ /** @brief Is this Thread a special model-checker thread? */
+ const bool model_thread;
};
Thread * thread_current();