X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=conditionvariable.cc;h=9d569e974406dc56831387c4f55e5321151d2739;hb=HEAD;hp=d5d0fc83e3bad340c15a85b97f611dfb50224b57;hpb=0229244d21ca78bf781e41684810e9fb6d5ca56c;p=c11tester.git

diff --git a/conditionvariable.cc b/conditionvariable.cc
index d5d0fc83..9d569e97 100644
--- a/conditionvariable.cc
+++ b/conditionvariable.cc
@@ -6,23 +6,23 @@
 namespace cdsc {
 
 condition_variable::condition_variable() {
-		
+
 }
 
 condition_variable::~condition_variable() {
-		
+
 }
 
 void condition_variable::notify_one() {
-	model->switch_to_master(new ModelAction(ATOMIC_NOTIFY_ONE, std::memory_order_seq_cst, this));
+	model->switch_thread(new ModelAction(ATOMIC_NOTIFY_ONE, std::memory_order_seq_cst, this));
 }
 
 void condition_variable::notify_all() {
-	model->switch_to_master(new ModelAction(ATOMIC_NOTIFY_ALL, std::memory_order_seq_cst, this));
+	model->switch_thread(new ModelAction(ATOMIC_NOTIFY_ALL, std::memory_order_seq_cst, this));
 }
 
 void condition_variable::wait(mutex& lock) {
-	model->switch_to_master(new ModelAction(ATOMIC_WAIT, std::memory_order_seq_cst, this, (uint64_t) &lock));
+	model->switch_thread(new ModelAction(ATOMIC_WAIT, std::memory_order_seq_cst, this, (uint64_t) &lock));
 	//relock as a second action
 	lock.lock();
 }