X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d2fa9464dd72784b0e3fa18067cbec14edff31c..63d238ad4d74226fae3321cb5c128f03160dacb2:/src/kernel/activity/ConditionVariableImpl.cpp diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp index 6193dfd3ef..ec3fb6ae52 100644 --- a/src/kernel/activity/ConditionVariableImpl.cpp +++ b/src/kernel/activity/ConditionVariableImpl.cpp @@ -1,46 +1,31 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/activity/ConditionVariableImpl.hpp" -#include "simgrid/Exception.hpp" #include "src/kernel/activity/MutexImpl.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/Synchro.hpp" +#include "src/kernel/actor/SynchroObserver.hpp" +#include // std::isfinite -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_condition, simix_synchro, "Condition variables"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_condition, ker_synchro, "Condition variables kernel-space implementation"); /********************************* Condition **********************************/ -/** @brief Handle a condition waiting simcall without timeouts */ -void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex) -{ - cond->wait(mutex, -1, simcall->issuer_); -} - -/** @brief Handle a condition waiting simcall with timeouts */ -void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout) -{ - simcall_cond_wait_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout - cond->wait(mutex, timeout, simcall->issuer_); -} - -namespace simgrid { -namespace kernel { -namespace activity { +namespace simgrid::kernel::activity { /** * @brief Signalizes a condition. * - * Signalizes a condition and wakes up a sleeping process. - * If there are no process sleeping, no action is done. + * Signalizes a condition and wakes up a sleeping actor. + * If there are no actor sleeping, no action is done. */ void ConditionVariableImpl::signal() { XBT_DEBUG("Signal condition %p", this); - /* If there are processes waiting for the condition choose one and try - to make it acquire the mutex */ + /* If there are actors waiting for the condition choose one and try to make it acquire the mutex */ if (not sleeping_.empty()) { auto& proc = sleeping_.front(); sleeping_.pop_front(); @@ -49,15 +34,10 @@ void ConditionVariableImpl::signal() proc.waiting_synchro_ = nullptr; /* Now transform the cond wait simcall into a mutex lock one */ - smx_simcall_t simcall = &proc.simcall_; - MutexImpl* simcall_mutex; - if (simcall->call_ == simix::Simcall::COND_WAIT) - simcall_mutex = simcall_cond_wait__get__mutex(simcall); - else - simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall); - simcall->call_ = simix::Simcall::MUTEX_LOCK; - - simcall_mutex->lock(simcall->issuer_); + actor::Simcall* simcall = &proc.simcall_; + const auto* observer = dynamic_cast(simcall->observer_); + xbt_assert(observer != nullptr); + observer->get_mutex()->lock_async(simcall->issuer_)->wait_for(simcall->issuer_, -1); } XBT_OUT(); } @@ -65,8 +45,8 @@ void ConditionVariableImpl::signal() /** * @brief Broadcasts a condition. * - * Signal ALL processes waiting on a condition. - * If there are no process waiting, no action is done. + * Signal ALL actors waiting on a condition. + * If there are no actor waiting, no action is done. */ void ConditionVariableImpl::broadcast() { @@ -77,32 +57,38 @@ void ConditionVariableImpl::broadcast() signal(); } -void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::ActorImpl* issuer) +void ConditionVariableImpl::wait(MutexImpl* mutex, double timeout, actor::ActorImpl* issuer) { XBT_DEBUG("Wait condition %p", this); - - /* If there is a mutex unlock it */ - if (mutex != nullptr) { - xbt_assert(mutex->get_owner() == issuer, - "Actor %s cannot wait on ConditionVariable %p since it does not own the provided mutex %p", - issuer->get_cname(), this, mutex); - mutex_ = mutex; - mutex->unlock(issuer); - } - - RawImplPtr synchro(new RawImpl()); + xbt_assert(std::isfinite(timeout), "timeout is not finite!"); + + /* Unlock the provided mutex (the simcall observer ensures that one is provided, no need to check) */ + auto* owner = mutex->get_owner(); + xbt_assert(owner == issuer, + "Actor %s cannot wait on ConditionVariable %p since it does not own the provided mutex %p (which is " + "owned by %s).", + issuer->get_cname(), this, mutex, (owner == nullptr ? "nobody" : owner->get_cname())); + mutex_ = mutex; + mutex->unlock(issuer); + + SynchroImplPtr synchro(new SynchroImpl([this, issuer]() { + this->remove_sleeping_actor(*issuer); + auto* observer = dynamic_cast(issuer->simcall_.observer_); + xbt_assert(observer != nullptr); + observer->set_result(true); + })); synchro->set_host(issuer->get_host()).set_timeout(timeout).start(); synchro->register_simcall(&issuer->simcall_); sleeping_.push_back(*issuer); } // boost::intrusive_ptr support: -void intrusive_ptr_add_ref(simgrid::kernel::activity::ConditionVariableImpl* cond) +void intrusive_ptr_add_ref(ConditionVariableImpl* cond) { cond->refcount_.fetch_add(1, std::memory_order_relaxed); } -void intrusive_ptr_release(simgrid::kernel::activity::ConditionVariableImpl* cond) +void intrusive_ptr_release(ConditionVariableImpl* cond) { if (cond->refcount_.fetch_sub(1, std::memory_order_release) == 1) { std::atomic_thread_fence(std::memory_order_acquire); @@ -110,6 +96,4 @@ void intrusive_ptr_release(simgrid::kernel::activity::ConditionVariableImpl* con delete cond; } } -} // namespace activity -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::activity