X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=libthreads.cc;h=28982582eb15fadf2e3f4d5a5152ca0e26489ef3;hb=6d9abf287d99279385cd858bd58602ab19654a8b;hp=e8d3b6e61e78710169d03da5b4d57180a7c388e0;hpb=934b4d3e585ee77329a9211b03d2b72b7b6ebdf9;p=model-checker.git

diff --git a/libthreads.cc b/libthreads.cc
index e8d3b6e..2898258 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -10,28 +10,29 @@
  */
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
+	Thread *thread;
 	int ret;
 	DBG();
-	ret = model->add_thread(new Thread(t, start_routine, arg));
+	thread = new Thread(t, start_routine, arg);
+	ret = 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));
+	model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
 	return ret;
 }
 
 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;
+	while (th->get_state() != THREAD_COMPLETED)
+		model->switch_to_master(NULL);
+	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)