Take simcalls {execution,io}_wait toward modernity.

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

diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp
index a0d3cc5..227ab30 100644 (file)
--- a/src/s4u/s4u_Exec.cpp
+++ b/src/s4u/s4u_Exec.cpp
@@ -20,26 +20,6 @@ Exec::Exec()
   pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl());
 }
 
-bool Exec::test()
-{
-  xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
-             state_ == State::FINISHED);
-
-  if (state_ == State::FINISHED)
-    return true;
-
-  if (state_ == State::INITED || state_ == State::STARTING)
-    this->vetoable_start();
-
-  if (simcall_execution_test(pimpl_)) {
-    state_ = State::FINISHED;
-    this->release_dependencies();
-    return true;
-  }
-
-  return false;
-}
-
 Exec* Exec::wait()
 {
   return this->wait_for(-1);
@@ -49,7 +29,9 @@ Exec* Exec::wait_for(double timeout)
 {
   if (state_ == State::INITED)
     vetoable_start();
-  simcall_execution_wait(pimpl_, timeout);
+
+  kernel::actor::ActorImpl* issuer = Actor::self()->get_impl();
+  kernel::actor::simcall_blocking<void>([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); });
   state_ = State::FINISHED;
   on_completion(*Actor::self(), *this);
   this->release_dependencies();
@@ -166,8 +148,7 @@ ExecPtr ExecSeq::set_host(Host* host)
   return this;
 }
 
-/** @brief Returns the amount of flops that remain to be done */
-double ExecSeq::get_remaining()
+double ExecSeq::get_remaining() const
 {
   return kernel::actor::simcall(
       [this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_remaining(); });
@@ -177,7 +158,7 @@ double ExecSeq::get_remaining()
  *
  * The returned value is between 0 (completely done) and 1 (nothing done yet).
  */
-double ExecSeq::get_remaining_ratio()
+double ExecSeq::get_remaining_ratio() const
 {
   return kernel::actor::simcall(
       [this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_seq_remaining_ratio(); });
@@ -205,13 +186,13 @@ Exec* ExecPar::start()
   return this;
 }
 
-double ExecPar::get_remaining_ratio()
+double ExecPar::get_remaining_ratio() const
 {
   return kernel::actor::simcall(
       [this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_par_remaining_ratio(); });
 }
 
-double ExecPar::get_remaining()
+double ExecPar::get_remaining() const
 {
   XBT_WARN("Calling get_remaining() on a parallel execution is not allowed. Call get_remaining_ratio() instead.");
   return get_remaining_ratio();