X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=86a95e63f7d83d73f81ac89197102b85ba410eb6;hb=acc524bb1a039c2230f5588e27c9b0da5666d801;hp=a43505e0e7d4fa18fda72f1d455532414c67f372;hpb=abedadbaa941d312cccfe370d98e23874fe7af82;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index a43505e..86a95e6 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -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;
 }