X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62c07d4306a42be1ed34494a37603bb6dd27a98b..8d0b1f2f1840a16bb9551f1cfd74f2488599f95b:/src/s4u/s4u_ConditionVariable.cpp

diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp
index e43d0e9ff3..5355b1a99d 100644
--- a/src/s4u/s4u_ConditionVariable.cpp
+++ b/src/s4u/s4u_ConditionVariable.cpp
@@ -1,26 +1,24 @@
-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-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 "simgrid/cond.h"
-#include "simgrid/forward.h"
-#include "simgrid/s4u/ConditionVariable.hpp"
-#include "simgrid/simix.h"
+#include <simgrid/cond.h>
+#include <simgrid/s4u/ConditionVariable.hpp>
+#include <xbt/log.h>
+
+#include "src/kernel/activity/ActivityImpl.hpp"
 #include "src/kernel/activity/ConditionVariableImpl.hpp"
-#include "src/mc/checker/SimcallObserver.hpp"
-#include "xbt/log.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
 
-#include <exception>
 #include <mutex>
 
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
 
 ConditionVariablePtr ConditionVariable::create()
 {
   kernel::activity::ConditionVariableImpl* cond =
-      kernel::actor::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+      kernel::actor::simcall_answered([] { return new kernel::activity::ConditionVariableImpl(); });
   return ConditionVariablePtr(cond->get_iface(), false);
 }
 
@@ -30,16 +28,16 @@ ConditionVariablePtr ConditionVariable::create()
 void ConditionVariable::wait(MutexPtr lock)
 {
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-  mc::ConditionWaitSimcall observer{issuer, pimpl_, lock->pimpl_};
-  kernel::actor::simcall_blocking<void>(
+  kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock->pimpl_};
+  kernel::actor::simcall_blocking(
       [&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
 }
 
 void ConditionVariable::wait(const std::unique_lock<Mutex>& lock)
 {
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-  mc::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_};
-  kernel::actor::simcall_blocking<void>(
+  kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_};
+  kernel::actor::simcall_blocking(
       [&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
 }
 
@@ -49,7 +47,12 @@ 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();
+  kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_, timeout};
+  bool timed_out = kernel::actor::simcall_blocking(
+      [&observer] { observer.get_cond()->wait(observer.get_mutex(), observer.get_timeout(), observer.get_issuer()); },
+      &observer);
+  if (timed_out) {
     // If we reached the timeout, we have to take the lock again:
     lock.mutex()->lock();
     return std::cv_status::timeout;
@@ -60,7 +63,7 @@ std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock<Mutex>& l
 
 std::cv_status ConditionVariable::wait_until(const std::unique_lock<Mutex>& lock, double timeout_time)
 {
-  double now = SIMIX_get_clock();
+  double now = Engine::get_clock();
   double timeout;
   if (timeout_time < now)
     timeout = 0.0;
@@ -74,12 +77,12 @@ std::cv_status ConditionVariable::wait_until(const std::unique_lock<Mutex>& lock
  */
 void ConditionVariable::notify_one()
 {
-  simgrid::kernel::actor::simcall([this]() { pimpl_->signal(); });
+  simgrid::kernel::actor::simcall_answered([this]() { pimpl_->signal(); });
 }
 
 void ConditionVariable::notify_all()
 {
-  simgrid::kernel::actor::simcall([this]() { pimpl_->broadcast(); });
+  simgrid::kernel::actor::simcall_answered([this]() { pimpl_->broadcast(); });
 }
 
 void intrusive_ptr_add_ref(const ConditionVariable* cond)
@@ -92,8 +95,7 @@ void intrusive_ptr_release(const ConditionVariable* cond)
   intrusive_ptr_release(cond->pimpl_);
 }
 
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
 
 /* **************************** Public C interface *************************** */
 sg_cond_t sg_cond_init()
@@ -108,8 +110,8 @@ 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;
+  std::unique_lock lock(*mutex);
+  return cond->wait_for(lock, delay) == std::cv_status::timeout;
 }
 
 void sg_cond_notify_one(sg_cond_t cond)