X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=2b2bf85ac374b2a57ab85b2ddfb82f184c6372ea;hb=2e9b955070a194963ddb98a5cb3e16968323adec;hp=98df4248fd83749ac9d7c36b7cbb14a3473a2710;hpb=3519c47202090f3c4a69de0e89aaa2617b17ff75;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index 98df424..2b2bf85 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,6 @@
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /* global "model" object */
 #include "model.h"
@@ -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;
 }