X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d0b1f2f1840a16bb9551f1cfd74f2488599f95b..1067edf07adcaa046abb976e7d92174d608b2d91:/src/s4u/s4u_ConditionVariable.cpp diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp index 5355b1a99d..74ae59b881 100644 --- a/src/s4u/s4u_ConditionVariable.cpp +++ b/src/s4u/s4u_ConditionVariable.cpp @@ -28,7 +28,7 @@ ConditionVariablePtr ConditionVariable::create() void ConditionVariable::wait(MutexPtr lock) { kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock->pimpl_}; + kernel::actor::ConditionVariableObserver observer{issuer, pimpl_, lock->pimpl_}; kernel::actor::simcall_blocking( [&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer); } @@ -36,7 +36,7 @@ void ConditionVariable::wait(MutexPtr lock) void ConditionVariable::wait(const std::unique_lock& lock) { kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_}; + kernel::actor::ConditionVariableObserver observer{issuer, pimpl_, lock.mutex()->pimpl_}; kernel::actor::simcall_blocking( [&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer); } @@ -48,7 +48,7 @@ std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock& l timeout = 0.0; kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_, timeout}; + kernel::actor::ConditionVariableObserver observer{issuer, pimpl_, lock.mutex()->pimpl_, timeout}; bool timed_out = kernel::actor::simcall_blocking( [&observer] { observer.get_cond()->wait(observer.get_mutex(), observer.get_timeout(), observer.get_issuer()); }, &observer);