Unify on_start/on_completion signals of Activities

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

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index a246446..c9a7430 100644 (file)
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -15,18 +15,13 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 
-void simcall_HANDLER_io_wait(smx_simcall_t simcall, simgrid::kernel::activity::IoImpl* synchro, double timeout)
-{
-  synchro->wait_for(simcall->issuer_, timeout);
-}
-
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
 IoImpl& IoImpl::set_timeout(double timeout)
 {
-  s4u::Host* host   = get_disk() ? get_disk()->get_host() : s4u::Host::by_name(get_storage()->get_host());
+  const s4u::Host* host = get_disk() ? get_disk()->get_host() : s4u::Host::by_name(get_storage()->get_host());
   timeout_detector_ = host->pimpl_cpu->sleep(timeout);
   timeout_detector_->set_activity(this);
   return *this;
@@ -66,42 +61,10 @@ IoImpl* IoImpl::start()
   surf_action_->set_activity(this);
 
   XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
-  IoImpl::on_start(*this);
 
   return this;
 }
 
-void IoImpl::wait_for(actor::ActorImpl* issuer, double timeout)
-{
-  XBT_DEBUG("Wait for execution of synchro %p, state %d", this, (int)state_);
-
-  /* Associate this simcall to the synchro */
-  register_simcall(&issuer->simcall);
-
-  if (MC_is_active() || MC_record_replay_is_active()) {
-    int idx = SIMCALL_GET_MC_VALUE(issuer->simcall);
-    if (idx == 0) {
-      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;
-      state_ = simgrid::kernel::activity::State::TIMEOUT;
-    }
-    finish();
-    return;
-  }
-
-  /* If the synchro is already finished then perform the error handling */
-  if (state_ != simgrid::kernel::activity::State::RUNNING)
-    finish();
-  else {
-    /* we need a sleep action (even when there is no timeout) to be notified of host failures */
-    set_timeout(timeout);
-  }
-}
-
 void IoImpl::post()
 {
   performed_ioops_ = surf_action_->get_cost();
@@ -116,13 +79,12 @@ void IoImpl::post()
     state_ = State::TIMEOUT;
   }
 
+  clean_action();
   if (timeout_detector_) {
     timeout_detector_->unref();
     timeout_detector_ = nullptr;
   }
 
-  on_completion(*this);
-
   /* Answer all simcalls associated with the synchro */
   finish();
 }
@@ -152,17 +114,11 @@ void IoImpl::finish()
         xbt_die("Internal error in IoImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
     }
 
-    simcall->issuer_->waiting_synchro = nullptr;
+    simcall->issuer_->waiting_synchro_ = nullptr;
     simcall->issuer_->simcall_answer();
   }
 }
 
-/*************
- * Callbacks *
- *************/
-xbt::signal<void(IoImpl const&)> IoImpl::on_start;
-xbt::signal<void(IoImpl const&)> IoImpl::on_completion;
-
 } // namespace activity
 } // namespace kernel
 } // namespace simgrid