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

diff --git a/libthreads.cc b/libthreads.cc
index fce87da..75d1910 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,7 @@
 #include <threads.h>
 #include "common.h"
 #include "threads-model.h"
+#include "action.h"
 
 /* global "model" object */
 #include "model.h"
@@ -10,17 +11,15 @@
  */
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
-	Thread *thread;
-	thread = new Thread(t, start_routine, arg);
-	model->add_thread(thread);
+	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_to_master(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));
+	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;
 }
@@ -28,7 +27,7 @@ int thrd_join(thrd_t t)
 /** A no-op, for now */
 void thrd_yield(void)
 {
-	//model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
+	model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
 }
 
 thrd_t thrd_current(void)