X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mutex.cc;h=fa751783dcc4418ddc8087e7ee5b24d566c412a5;hp=10fb5e3248b0550dd8b18afea34164380306ff23;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=9cf7a4cf4ce3caa33c27b4211db3d987a6b103ec

diff --git a/mutex.cc b/mutex.cc
index 10fb5e32..fa751783 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -11,7 +11,7 @@ namespace cdsc {
 mutex::mutex(int type)
 {
 	state.locked = NULL;
-	thread_id_t tid = thread_current()->get_id();
+	thread_id_t tid = thread_current_id();
 	state.alloc_tid = tid;
 	ClockVector *cv = model->get_execution()->get_cv(tid);
 	state.alloc_clock = cv  == NULL ? 0 : cv->getClock(tid);
@@ -23,17 +23,17 @@ mutex::mutex(int type)
 
 void mutex::lock()
 {
-	model->switch_to_master(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
+	model->switch_thread(new ModelAction(ATOMIC_LOCK, std::memory_order_seq_cst, this));
 }
 
 bool mutex::try_lock()
 {
-	return model->switch_to_master(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
+	return model->switch_thread(new ModelAction(ATOMIC_TRYLOCK, std::memory_order_seq_cst, this));
 }
 
 void mutex::unlock()
 {
-	model->switch_to_master(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
+	model->switch_thread(new ModelAction(ATOMIC_UNLOCK, std::memory_order_seq_cst, this));
 }
 
 }