X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=conditionvariable.cc;h=9d569e974406dc56831387c4f55e5321151d2739;hp=1d049f1893c4bd66fb799ef0caba1eedd814f933;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=63b2c687570085f2a87b6a659d26608228af1ee0 diff --git a/conditionvariable.cc b/conditionvariable.cc index 1d049f18..9d569e97 100644 --- a/conditionvariable.cc +++ b/conditionvariable.cc @@ -14,15 +14,15 @@ 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(); }