X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=libthreads.cc;h=98df4248fd83749ac9d7c36b7cbb14a3473a2710;hp=a414686dccb713116bad22a1e6126f590b72cc7b;hb=45d8b1a74beaf6a80ce44a1f9aa3d59abc5d0582;hpb=c3ec6bb763ab72e04596bbdfb534578aab545d8f

diff --git a/libthreads.cc b/libthreads.cc
index a414686..98df424 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -11,29 +11,27 @@
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
 	Thread *thread;
-	int ret;
 	DBG();
 	thread = new Thread(t, start_routine, arg);
-	ret = model->add_thread(thread);
+	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, thread, 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;
+	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)