static void * stack_allocate(size_t size)
{
- return malloc(size);
+ return userMalloc(size);
}
static void stack_free(void *stack)
{
- free(stack);
+ userFree(stack);
}
Thread * thread_current(void)
if (ret)
return ret;
- /* start_routine == NULL means this is our initial context */
- if (!start_routine)
- return 0;
-
/* Initialize new managed context */
stack = stack_allocate(STACK_SIZE);
context.uc_stack.ss_sp = stack;
context.uc_stack.ss_size = STACK_SIZE;
context.uc_stack.ss_flags = 0;
- context.uc_link = &model->system_thread->context;
+ context.uc_link = model->get_system_context();
makecontext(&context, start_routine, 1, arg);
return 0;
}
-int Thread::swap(Thread *t)
+int Thread::swap(Thread *t, ucontext_t *ctxt)
{
- return swapcontext(&this->context, &t->context);
+ return swapcontext(&t->context, ctxt);
+}
+
+int Thread::swap(ucontext_t *ctxt, Thread *t)
+{
+ return swapcontext(ctxt, &t->context);
}
void Thread::complete()
}
}
+void * Thread::operator new(size_t size) {
+ return userMalloc(size);
+}
+
+void Thread::operator delete(void *ptr) {
+ userFree(ptr);
+}
+
Thread::Thread(thrd_t *t, void (*func)(), void *a) {
int ret;
*user_thread = id;
}
-Thread::Thread(thrd_t *t) {
- /* system thread */
- user_thread = t;
- start_routine = NULL;
- arg = NULL;
-
- create_context();
- stack = NULL;
- state = THREAD_CREATED;
- id = model->get_next_id();
- *user_thread = id;
- model->add_system_thread(this);
-}
-
Thread::~Thread()
{
complete();
Thread *curr, *next;
curr = thread_current();
- model->check_current_action();
if (curr) {
- if (curr->get_state() == THREAD_READY)
+ if (curr->get_state() == THREAD_READY) {
+ model->check_current_action();
model->scheduler->add_thread(curr);
- else if (curr->get_state() == THREAD_RUNNING)
+ } else if (curr->get_state() == THREAD_RUNNING)
/* Stopped while running; i.e., completed */
curr->complete();
else
DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
if (!next)
return 1;
- return model->system_thread->swap(next);
+ return Thread::swap(model->get_system_context(), next);
}
static void thread_wait_finish(void)
*/
int main()
{
- thrd_t user_thread, main_thread;
- Thread *th;
+ thrd_t user_thread;
+ ucontext_t main_context;
model = new ModelChecker();
- th = new Thread(&main_thread);
+ if (getcontext(&main_context))
+ return 1;
+
+ model->set_system_context(&main_context);
do {
/* Start user program */
- thrd_create(&user_thread, &user_main, NULL);
+ model->add_thread(new Thread(&user_thread, &user_main, NULL));
/* Wait for all threads to complete */
thread_wait_finish();
} while (model->next_execution());
- delete th;
delete model;
DEBUG("Exiting\n");