X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;fp=pthread.cc;h=e95fb37a3c9b079599b19ca90dd9f00d74fd66b3;hb=9b6c5d465f4a762dbe75baf2c293510ee6e9bd07;hp=f5ce1bcf514e23c7a3e3b4e3f8facd82fa8b6ce2;hpb=bd3decdede241f9d7f9ac745d47518099b9b36b5;p=c11tester.git

diff --git a/pthread.cc b/pthread.cc
index f5ce1bcf..e95fb37a 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -25,7 +25,7 @@ int pthread_create(pthread_t *t, const pthread_attr_t * attr,
 	struct pthread_params params = { start_routine, arg };
 
 	/* seq_cst is just a 'don't care' parameter */
-	model->switch_to_master(new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params));
+	model->switch_thread(new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params));
 
 	return 0;
 }
@@ -34,7 +34,7 @@ int pthread_join(pthread_t t, void **value_ptr) {
 	ModelExecution *execution = model->get_execution();
 	Thread *th = execution->get_pthread(t);
 
-	model->switch_to_master(new ModelAction(PTHREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(th->get_id())));
+	model->switch_thread(new ModelAction(PTHREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(th->get_id())));
 
 	if ( value_ptr ) {
 		// store return value
@@ -59,7 +59,7 @@ int sched_yield() {
 void pthread_exit(void *value_ptr) {
 	Thread * th = thread_current();
 	th->set_pthread_return(value_ptr);
-	model->switch_to_master(new ModelAction(THREADONLY_FINISH, std::memory_order_seq_cst, th));
+	model->switch_thread(new ModelAction(THREADONLY_FINISH, std::memory_order_seq_cst, th));
 	//Need to exit so we don't return to the program
 	real_pthread_exit(NULL);
 }