X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=3ed4937dabe4df8e2feaf79c07b17b6260b14dba;hb=HEAD;hp=4d6a0243c53b7fe880952747236bd8327c04a108;hpb=0accacf66b9f7bb4479205a0840f208dd8da6960;p=c11tester.git

diff --git a/libthreads.cc b/libthreads.cc
index 4d6a0243..3ed4937d 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,8 @@
-#include "libthreads.h"
-#include "common.h"
 #include "threads.h"
+#include "common.h"
+#include "threads-model.h"
+#include "action.h"
+
 
 /* global "model" object */
 #include "model.h"
@@ -10,30 +12,30 @@
  */
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
-	Thread *thread;
-	DBG();
-	thread = new Thread(t, start_routine, arg);
-	model->add_thread(thread);
-	DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
+	createModelIfNotExist();
+	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, thread, VALUE_NONE));
+	model->switch_thread(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params));
 	return 0;
 }
 
 int thrd_join(thrd_t t)
 {
-	Thread *th = model->get_thread(thrd_to_id(t));
-	model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, thrd_to_id(t)));
+	createModelIfNotExist();
+	Thread *th = t.priv;
+	model->switch_thread(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, std::memory_order_seq_cst, NULL, VALUE_NONE));
+	createModelIfNotExist();
+	model->switch_thread(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
 }
 
 thrd_t thrd_current(void)
 {
+	createModelIfNotExist();
 	return thread_current()->get_thrd_t();
 }