X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41efdce0277c52d55f27af300df9821cbd18c12c..2ccf9c22b2e9dee40858cb70a44763f4084e15da:/src/kernel/activity/IoImpl.cpp

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 9a2e3f0e37..72e4007085 100644
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -15,15 +15,18 @@
 
 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)
+{
+  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;
+}
+
 IoImpl& IoImpl::set_type(s4u::Io::OpType type)
 {
   type_ = type;
@@ -63,40 +66,6 @@ IoImpl* IoImpl::start()
   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 */
-    if (get_disk() != nullptr)
-      set_timeout_detector(get_disk()->get_host()->pimpl_cpu->sleep(timeout));
-    else
-      set_timeout_detector(simgrid::s4u::Host::by_name(get_storage()->get_host())->pimpl_cpu->sleep(timeout));
-  }
-}
-
 void IoImpl::post()
 {
   performed_ioops_ = surf_action_->get_cost();
@@ -111,6 +80,7 @@ void IoImpl::post()
     state_ = State::TIMEOUT;
   }
 
+  clean_action();
   if (timeout_detector_) {
     timeout_detector_->unref();
     timeout_detector_ = nullptr;
@@ -147,7 +117,7 @@ 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();
   }
 }