X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=libthreads.cc;h=75d1910718db8f1f594213072582be48b2c35ee3;hp=b5760ae6eab89f381a67b12a4e05f0402ef7ad76;hb=99d6712ba5650460a527c144cbc814bbe209bb4c;hpb=c5e14aa2426f21f8de620cf24ed321447d75c989

diff --git a/libthreads.cc b/libthreads.cc
index b5760ae..75d1910 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,7 @@
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"
@@ -8,30 +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", id_to_int(thrd_to_id(*t)));
+	struct thread_params params = { start_routine, arg };
 	/* seq_cst is just a 'don't care' parameter */
-	model->switch_to_master(new ModelAction(THREAD_CREATE, memory_order_seq_cst, NULL, VALUE_NONE));
-	return ret;
+	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)
-		ret = model->switch_to_master(NULL);
-	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)