X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=75d1910718db8f1f594213072582be48b2c35ee3;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=7ed5491f675fe91d646a8bec1d056ae712ea2ab3;hpb=e1430f3d41e01fca5b878fc5909cf1c871c12f0e;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index 7ed5491..75d1910 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,7 @@
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads_internal.h"
+#include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"
@@ -8,29 +9,25 @@
 /*
  * User program API functions
  */
-int thrd_create(thrd_t *t, void (*start_routine)(), void *arg)
+int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
-	int ret;
-	DBG();
-	ret = model->add_thread(new Thread(t, start_routine, arg));
-	DEBUG("create thread %d\n", thrd_to_id(*t));
-	return ret;
+	struct thread_params params = { start_routine, arg };
+	/* seq_cst is just a 'don't care' parameter */
+	model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params));
+	return 0;
 }
 
 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));
-	return ret;
+	Thread *th = t.priv;
+	model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(thrd_to_id(t))));
+	return 0;
 }
 
-int thrd_yield(void)
+/** A no-op, for now */
+void thrd_yield(void)
 {
-	/* seq_cst is just a 'don't care' parameter */
-	return model->switch_to_master(new ModelAction(THREAD_YIELD, memory_order_seq_cst, NULL, VALUE_NONE));
+	model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
 }
 
 thrd_t thrd_current(void)