-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2021. 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 "simgrid/Exception.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/mc/checker/SimcallObserver.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_condition, simix_synchro, "Condition variables");
/********************************* 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_);
}
/* Now transform the cond wait simcall into a mutex lock one */
smx_simcall_t simcall = &proc.simcall_;
MutexImpl* simcall_mutex;
- if (simcall->call_ == SIMCALL_COND_WAIT)
- simcall_mutex = simcall_cond_wait__get__mutex(simcall);
- else
+ if (simcall->call_ == simix::Simcall::COND_WAIT_TIMEOUT)
simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
- simcall->call_ = SIMCALL_MUTEX_LOCK;
+ else {
+ // FIXME? using here the MC observer to solve a problem not related to MC
+ const 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_);
}
mutex->unlock(issuer);
}
- RawImplPtr synchro(new RawImpl());
+ 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);
+ }));
synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
synchro->register_simcall(&issuer->simcall_);
sleeping_.push_back(*issuer);