projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'norris'
[model-checker.git]
/
libthreads.cc
diff --git
a/libthreads.cc
b/libthreads.cc
index c54c9aa415e6289c43abcba24e4e3a8d32874755..4d6a0243c53b7fe880952747236bd8327c04a108 100644
(file)
--- a/
libthreads.cc
+++ b/
libthreads.cc
@@
-11,28
+11,26
@@
int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
{
Thread *thread;
int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
{
Thread *thread;
- int ret;
DBG();
thread = new Thread(t, start_routine, arg);
DBG();
thread = new Thread(t, start_routine, arg);
-
ret =
model->add_thread(thread);
+ model->add_thread(thread);
DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
/* seq_cst is just a 'don't care' parameter */
DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
/* seq_cst is just a 'don't care' parameter */
- model->switch_to_master(new ModelAction(THREAD_CREATE, memory_order_seq_cst, thread, VALUE_NONE));
- return
ret
;
+ model->switch_to_master(new ModelAction(THREAD_CREATE,
std::
memory_order_seq_cst, thread, VALUE_NONE));
+ return
0
;
}
int thrd_join(thrd_t t)
{
Thread *th = model->get_thread(thrd_to_id(t));
}
int thrd_join(thrd_t t)
{
Thread *th = model->get_thread(thrd_to_id(t));
- while (th->get_state() != THREAD_COMPLETED)
- model->switch_to_master(NULL);
+ model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, thrd_to_id(t)));
return 0;
}
int thrd_yield(void)
{
/* seq_cst is just a 'don't care' parameter */
return 0;
}
int thrd_yield(void)
{
/* seq_cst is just a 'don't care' parameter */
- return model->switch_to_master(new ModelAction(THREAD_YIELD, memory_order_seq_cst, NULL, VALUE_NONE));
+ return model->switch_to_master(new ModelAction(THREAD_YIELD,
std::
memory_order_seq_cst, NULL, VALUE_NONE));
}
thrd_t thrd_current(void)
}
thrd_t thrd_current(void)