projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: do not assume THREAD_FINISH is always the last action
[model-checker.git]
/
libthreads.cc
diff --git
a/libthreads.cc
b/libthreads.cc
index 73a948cc4a493a7fa4b3c1bea65af8653c6ebc17..f973176ba8344a497e687b8f452fdefed031fe5e 100644
(file)
--- a/
libthreads.cc
+++ b/
libthreads.cc
@@
-8,28
+8,29
@@
/*
* User program API functions
*/
/*
* User program API functions
*/
-int thrd_create(thrd_t *t,
void (*start_routine)()
, void *arg)
+int thrd_create(thrd_t *t,
thrd_start_t start_routine
, void *arg)
{
{
-
int ret
;
+
Thread *thread
;
DBG();
DBG();
- ret = model->add_thread(new Thread(t, start_routine, arg));
+ thread = new Thread(t, start_routine, arg);
+ model->add_thread(thread);
DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
- return ret;
+ /* seq_cst is just a 'don't care' parameter */
+ model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
+ return 0;
}
int thrd_join(thrd_t t)
{
}
int thrd_join(thrd_t t)
{
- int ret = 0;
Thread *th = model->get_thread(thrd_to_id(t));
Thread *th = model->get_thread(thrd_to_id(t));
- while (th->get_state() != THREAD_COMPLETED && !ret)
- ret = model->switch_to_master(NULL);
- return ret;
+ model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(thrd_to_id(t))));
+ return 0;
}
int thrd_yield(void)
{
/* seq_cst is just a 'don't care' parameter */
}
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)