X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=libthreads.cc;h=8e213aa858be5f56510871412e2cee3c906b78d6;hb=3f77119600ac3aa246258dec2776056d09f8e4e0;hp=05cca8646a3daf69db7c2992e70e540c893dccf2;hpb=26d1dd1430da05b8da4b1250b299a620ecd52102;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index 05cca86..8e213aa 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,19 +11,15 @@
  */
 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)));
+	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;
 }