X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=libthreads.cc;h=f973176ba8344a497e687b8f452fdefed031fe5e;hp=205821eac68255d696e89e945f71c06fd63ba7c5;hb=b4a228de75d93aad50a07b3b048f69bc57ba2dd8;hpb=9ab763adc965ca76a8d65b9898d20c60cdb44445

diff --git a/libthreads.cc b/libthreads.cc
index 205821e..f973176 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -8,30 +8,29 @@
 /*
  * User program API functions
  */
-int thrd_create(thrd_t *t, void (*start_routine)(void *), void *arg)
+int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
-	int ret;
+	Thread *thread;
 	DBG();
-	ret = model->add_thread(new Thread(t, start_routine, arg));
+	thread = new Thread(t, start_routine, arg);
+	model->add_thread(thread);
 	DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
 	/* 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, thread, VALUE_NONE));
+	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;
+	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)
 {
 	/* 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));
+	return model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, NULL, VALUE_NONE));
 }
 
 thrd_t thrd_current(void)