X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=f973176ba8344a497e687b8f452fdefed031fe5e;hb=9c42c31b487bf7319dba4d43e417e29420306977;hp=98df4248fd83749ac9d7c36b7cbb14a3473a2710;hpb=4730dd573ad7a28d875c31b6aa633f7bce420054;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index 98df424..f973176 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, id_to_int(thrd_to_id(t))));
 	return 0;
 }