X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=2b2bf85ac374b2a57ab85b2ddfb82f184c6372ea;hb=1732a51f04b471f5019377c5860672fc3ada0088;hp=28982582eb15fadf2e3f4d5a5152ca0e26489ef3;hpb=9fc455aa88e0fe0415081e282bd1bda4c633fa8f;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index 2898258..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"
@@ -11,21 +11,19 @@
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
 	Thread *thread;
-	int ret;
 	DBG();
 	thread = new Thread(t, start_routine, arg);
-	ret = model->add_thread(thread);
+	model->add_thread(thread);
 	DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
 	/* seq_cst is just a 'don't care' parameter */
 	model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
-	return ret;
+	return 0;
 }
 
 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;
 }