* 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/mc/checker/SimcallObserver.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
+#include <cmath> // std::isfinite
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_condition, simix_synchro, "Condition variables");
/********************************* Condition **********************************/
-/** @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 {
/**
* @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();
/* 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_TIMEOUT)
- simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
- else {
- // FIXME? using here the MC observer to solve a problem not related to MC
- auto* observer = dynamic_cast<mc::ConditionWaitSimcall*>(simcall->observer_);
- xbt_assert(observer != nullptr);
- simcall_mutex = observer->get_mutex();
- }
- simcall->call_ = simix::Simcall::RUN_BLOCKING;
-
- simcall_mutex->lock(simcall->issuer_);
+ const auto* observer = dynamic_cast<kernel::actor::ConditionWaitSimcall*>(simcall->observer_);
+ xbt_assert(observer != nullptr);
+ observer->get_mutex()->lock(simcall->issuer_);
}
XBT_OUT();
}
/**
* @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()
{
void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::ActorImpl* issuer)
{
XBT_DEBUG("Wait condition %p", this);
+ xbt_assert(std::isfinite(timeout), "timeout is not finite!");
/* If there is a mutex unlock it */
if (mutex != nullptr) {
RawImplPtr synchro(new RawImpl([this, issuer]() {
this->remove_sleeping_actor(*issuer);
- if (issuer->simcall_.call_ == simix::Simcall::COND_WAIT_TIMEOUT)
- simcall_cond_wait_timeout__set__result(&issuer->simcall_, 1);
+ auto* observer = dynamic_cast<kernel::actor::ConditionWaitSimcall*>(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_);
}
// boost::intrusive_ptr<ConditionVariableImpl> 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);