libthreads: only record 'final' even for thrd_join
authorBrian Norris <banorris@uci.edu>
Wed, 18 Apr 2012 19:36:58 +0000 (12:36 -0700)
committerBrian Norris <banorris@uci.edu>
Wed, 18 Apr 2012 19:36:58 +0000 (12:36 -0700)
libthreads.cc

index a43505e0e7d4fa18fda72f1d455532414c67f372..86a95e63f7d83d73f81ac89197102b85ba410eb6 100644 (file)
@@ -22,8 +22,9 @@ int thrd_join(thrd_t t)
        int ret = 0;
        Thread *th = model->get_thread(thrd_to_id(t));
        while (th->get_state() != THREAD_COMPLETED && !ret)
-               /* seq_cst is just a 'don't care' parameter */
-               ret = model->switch_to_master(new ModelAction(THREAD_JOIN, memory_order_seq_cst, NULL, VALUE_NONE));
+               ret = model->switch_to_master(NULL);
+       /* seq_cst is just a 'don't care' parameter */
+       ret = model->switch_to_master(new ModelAction(THREAD_JOIN, memory_order_seq_cst, NULL, VALUE_NONE));
        return ret;
 }