#include "schedule.h"
#include "common.h"
-/* global "model" struct */
+/* global "model" object */
#include "model.h"
#define STACK_SIZE (1024 * 1024)
static int create_initial_thread(struct thread *t)
{
memset(t, 0, sizeof(*t));
- model_checker_assign_id(t);
+ model->assign_id(t);
return create_context(t);
}
-static int thread_swap(struct thread *old, struct thread *new)
+static int thread_swap(struct thread *t1, struct thread *t2)
{
- return swapcontext(&old->context, &new->context);
+ return swapcontext(&t1->context, &t2->context);
}
static void thread_dispose(struct thread *t)
/*
* User program API functions
*/
-int thread_create(struct thread *t, void (*start_routine), void *arg)
+int thread_create(struct thread *t, void (*start_routine)(), void *arg)
{
int ret = 0;
DBG();
memset(t, 0, sizeof(*t));
- model_checker_assign_id(t);
+ model->assign_id(t);
DEBUG("create thread %d\n", t->id);
t->start_routine = start_routine;
struct thread user_thread;
struct thread *main_thread;
- model_checker_init();
+ model = new ModelChecker();
main_thread = (struct thread *)malloc(sizeof(*main_thread));
create_initial_thread(main_thread);
- model_checker_add_system_thread(main_thread);
+ model->add_system_thread(main_thread);
/* Start user program */
thread_create(&user_thread, &user_main, NULL);
/* Wait for all threads to complete */
thread_wait_finish();
+ delete model;
+
DEBUG("Exiting\n");
return 0;
}