projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mistake
[model-checker.git]
/
libthreads.cc
diff --git
a/libthreads.cc
b/libthreads.cc
index 98df4248fd83749ac9d7c36b7cbb14a3473a2710..f973176ba8344a497e687b8f452fdefed031fe5e 100644
(file)
--- a/
libthreads.cc
+++ b/
libthreads.cc
@@
-23,8
+23,7
@@
int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
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, id_to_int(thrd_to_id(t))));
return 0;
}
return 0;
}