projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
demote 'system_thread' to just 'system_context'
[model-checker.git]
/
threads.cc
diff --git
a/threads.cc
b/threads.cc
index 7d4d22e7aafc68c2cf9e4332e9fceff7465ead46..dc7202e3aaa08e4e9dc00d8d6a40e6c04834180e 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-12,12
+12,12
@@
static void * stack_allocate(size_t size)
{
static void * stack_allocate(size_t size)
{
- return
m
alloc(size);
+ return
userM
alloc(size);
}
static void stack_free(void *stack)
{
}
static void stack_free(void *stack)
{
-
f
ree(stack);
+
userF
ree(stack);
}
Thread * thread_current(void)
}
Thread * thread_current(void)
@@
-42,15
+42,20
@@
int Thread::create_context()
context.uc_stack.ss_sp = stack;
context.uc_stack.ss_size = STACK_SIZE;
context.uc_stack.ss_flags = 0;
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;
}
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::complete()
@@
-58,10
+63,19
@@
void Thread::complete()
if (state != THREAD_COMPLETED) {
DEBUG("completed thread %d\n", get_id());
state = THREAD_COMPLETED;
if (state != THREAD_COMPLETED) {
DEBUG("completed thread %d\n", get_id());
state = THREAD_COMPLETED;
- stack_free(stack);
+ if (stack)
+ stack_free(stack);
}
}
}
}
+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;
Thread::Thread(thrd_t *t, void (*func)(), void *a) {
int ret;
@@
-85,11
+99,12
@@
Thread::Thread(thrd_t *t) {
start_routine = NULL;
arg = NULL;
start_routine = NULL;
arg = NULL;
+ create_context();
+ stack = NULL;
state = THREAD_CREATED;
id = model->get_next_id();
*user_thread = id;
state = THREAD_CREATED;
id = model->get_next_id();
*user_thread = id;
- create_context();
- model->add_system_thread(this);
+ model->set_system_context(&context);
}
Thread::~Thread()
}
Thread::~Thread()
@@
-111,11
+126,11
@@
static int thread_system_next(void)
Thread *curr, *next;
curr = thread_current();
Thread *curr, *next;
curr = thread_current();
- model->check_current_action();
if (curr) {
if (curr) {
- if (curr->get_state() == THREAD_READY)
+ if (curr->get_state() == THREAD_READY) {
+ model->check_current_action();
model->scheduler->add_thread(curr);
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
/* Stopped while running; i.e., completed */
curr->complete();
else
@@
-127,7
+142,7
@@
static int thread_system_next(void)
DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
if (!next)
return 1;
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)
}
static void thread_wait_finish(void)
@@
-143,12
+158,15
@@
static void thread_wait_finish(void)
*/
int main()
{
*/
int main()
{
- thrd_t user_thread
, main_thread
;
-
Thread *th
;
+ thrd_t user_thread;
+
ucontext_t main_context
;
model = new ModelChecker();
model = new ModelChecker();
- th = new Thread(&main_thread);
+ if (getcontext(&main_context))
+ return 1;
+
+ model->set_system_context(&main_context);
do {
/* Start user program */
do {
/* Start user program */
@@
-156,11
+174,8
@@
int main()
/* Wait for all threads to complete */
thread_wait_finish();
/* Wait for all threads to complete */
thread_wait_finish();
-
- model->print_trace();
} while (model->next_execution());
} while (model->next_execution());
- delete th;
delete model;
DEBUG("Exiting\n");
delete model;
DEBUG("Exiting\n");