X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29846dce9607816c7e06b2c8108e95e182088e5e..64a60fa58ca5dc30df8b2780c4901773f219d8ea:/src/kernel/activity/ConditionVariableImpl.cpp

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index 87683e1009..8b5d7846df 100644
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -8,18 +8,12 @@
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "src/mc/checker/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 {
@@ -45,18 +39,10 @@ void ConditionVariableImpl::signal()
 
     /* 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
-      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_);
+    // 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);
+    observer->get_mutex()->lock(simcall->issuer_);
   }
   XBT_OUT();
 }
@@ -79,6 +65,7 @@ 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) {
@@ -91,8 +78,9 @@ void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::Actor
 
   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<mc::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_);