X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=libthreads.cc;h=4d6a0243c53b7fe880952747236bd8327c04a108;hp=98df4248fd83749ac9d7c36b7cbb14a3473a2710;hb=05f82cd6ab941db2d63ca83e778a430752de1900;hpb=3519c47202090f3c4a69de0e89aaa2617b17ff75

diff --git a/libthreads.cc b/libthreads.cc
index 98df424..4d6a024 100644
--- 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));
-	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;
 }