Slight simplification.

[simgrid.git] / src / kernel / activity / ExecImpl.cpp

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index e3d9d322c0cad681cc94b190c4c2778b4a6d369a..f4ce2de60a47efee4ae1b1461907c5149038295b 100644 (file)
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -17,38 +17,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
-void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro, double timeout)
-{
-  XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
-  xbt_assert(std::isfinite(timeout), "timeout is not finite!");
-
-  /* Associate this simcall to the synchro */
-  synchro->register_simcall(simcall);
-
-  /* set surf's synchro */
-  if (MC_is_active() || MC_record_replay_is_active()) {
-    int idx = SIMCALL_GET_MC_VALUE(*simcall);
-    if (idx == 0) {
-      synchro->state_ = simgrid::kernel::activity::State::DONE;
-    } else {
-      /* If we reached this point, the wait simcall must have a timeout */
-      /* Otherwise it shouldn't be enabled and executed by the MC */
-      if (timeout < 0.0)
-        THROW_IMPOSSIBLE;
-      synchro->state_ = simgrid::kernel::activity::State::TIMEOUT;
-    }
-    synchro->finish();
-    return;
-  }
-
-  /* If the synchro is already finished then perform the error handling */
-  if (synchro->state_ != simgrid::kernel::activity::State::RUNNING) {
-    synchro->finish();
-  } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */
-    synchro->set_timeout(timeout);
-  }
-}
-
 void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[],
                                            size_t count, double timeout)
 {
@@ -56,6 +24,7 @@ void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kerne
     simcall->timeout_cb_ = nullptr;
   } else {
     simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
+      simcall->timeout_cb_ = nullptr;
       for (size_t i = 0; i < count; i++) {
         // Remove the first occurrence of simcall:
         auto* exec = execs[i];
@@ -86,6 +55,15 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
+ExecImpl::ExecImpl()
+{
+  actor::ActorImpl* self = actor::ActorImpl::self();
+  if (self) {
+    actor_ = self;
+    self->activities_.push_back(this);
+  }
+}
+
 ExecImpl& ExecImpl::set_host(s4u::Host* host)
 {
   hosts_.assign(1, host);
@@ -187,6 +165,10 @@ void ExecImpl::post()
 
   clean_action();
   timeout_detector_.reset();
+  if (actor_) {
+    actor_->activities_.remove(this);
+    actor_ = nullptr;
+  }
   /* Answer all simcalls associated with the synchro */
   finish();
 }
@@ -257,7 +239,7 @@ void ExecImpl::finish()
         xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
     }
 
-    simcall->issuer_->waiting_synchro = nullptr;
+    simcall->issuer_->waiting_synchro_ = nullptr;
     /* Fail the process if the host is down */
     if (simcall->issuer_->get_host()->is_on())
       simcall->issuer_->simcall_answer();