#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;
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();
*/
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; }
Thread * waiting_on() const;
bool is_waiting_on(const Thread *t) 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_model_thread() const { return model_thread; }
friend void thread_startup();
ModelAction *pending;
void (*start_routine)(void *);
+ void *(*pstart_routine)(void *);
+
void *arg;
ucontext_t context;
void *stack;
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()
*/
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)
{
return id;
}
-#endif /* __THREADS_MODEL_H__ */
+#endif /* __THREADS_MODEL_H__ */