Merge branch 'models_type_rework_part2_try2' into 'master'

[simgrid.git] / src / s4u / s4u_ConditionVariable.cpp

diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp
index 102d683ffbdc390eab89a7c8ce38c273e32e22fc..a59726f988a9d80d8ec54bbfea10cb5dd2a198d8 100644 (file)
--- a/src/s4u/s4u_ConditionVariable.cpp
+++ b/src/s4u/s4u_ConditionVariable.cpp
@@ -8,6 +8,8 @@
 #include "simgrid/s4u/ConditionVariable.hpp"
 #include "simgrid/simix.h"
 #include "src/kernel/activity/ConditionVariableImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/checker/SimcallObserver.hpp"
 #include "xbt/log.hpp"
 
 #include <exception>
@@ -28,12 +30,18 @@ ConditionVariablePtr ConditionVariable::create()
  */
 void ConditionVariable::wait(MutexPtr lock)
 {
-  simcall_cond_wait(pimpl_, lock->pimpl_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  mc::ConditionWaitSimcall observer{issuer, pimpl_, lock->pimpl_};
+  kernel::actor::simcall_blocking<void>(
+      [&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
 }
 
 void ConditionVariable::wait(const std::unique_lock<Mutex>& lock)
 {
-  simcall_cond_wait(pimpl_, lock.mutex()->pimpl_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  mc::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_};
+  kernel::actor::simcall_blocking<void>(
+      [&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
 }
 
 std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock<Mutex>& lock, double timeout)
@@ -42,7 +50,13 @@ std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock<Mutex>& l
   if (timeout < 0)
     timeout = 0.0;
 
-  if (simcall_cond_wait_timeout(pimpl_, lock.mutex()->pimpl_, timeout)) {
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  mc::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_, timeout};
+  kernel::actor::simcall_blocking<void>(
+      [&observer] { observer.get_cond()->wait(observer.get_mutex(), observer.get_timeout(), observer.get_issuer()); },
+      &observer);
+  bool timed_out = observer.get_result();
+  if (timed_out) {
     // If we reached the timeout, we have to take the lock again:
     lock.mutex()->lock();
     return std::cv_status::timeout;
@@ -102,7 +116,7 @@ void sg_cond_wait(sg_cond_t cond, sg_mutex_t mutex)
 int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
 {
   std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
-  return cond->wait_for(lock, delay) == std::cv_status::timeout ? 1 : 0;
+  return cond->wait_for(lock, delay) == std::cv_status::timeout;
 }
 
 void sg_cond_notify_one(sg_cond_t cond)