model: bugfix - release sequences - handle Thread completion

[c11tester.git] / libthreads.cc

diff --git a/libthreads.cc b/libthreads.cc
index 28982582eb15fadf2e3f4d5a5152ca0e26489ef3..4d6a0243c53b7fe880952747236bd8327c04a108 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -11,21 +11,19 @@
 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);
-       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 */
        model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
-       return ret;
+       return 0;
 }
 
 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;
 }