X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dd8ed849c18cee8b5ed26fbfc2d48846158d7ed..3203afd846219ef8b41cadda945ea0a98103c46f:/src/kernel/activity/IoImpl.cpp

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 30b4ee8e9b..1a7e46fd9e 100644
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -1,21 +1,15 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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/Exception.hpp>
 #include <simgrid/kernel/routing/NetPoint.hpp>
-#include <simgrid/s4u/Engine.hpp>
-#include <simgrid/s4u/Host.hpp>
 
-#include "mc/mc.h"
 #include "src/kernel/activity/IoImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
-#include "src/kernel/actor/SimcallObserver.hpp"
-#include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
-#include "src/mc/mc_replay.hpp"
-#include "src/surf/HostImpl.hpp"
+#include "src/kernel/resource/HostImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_io, kernel, "Kernel io-related synchronization");
 
@@ -27,7 +21,7 @@ IoImpl::IoImpl()
   actor::ActorImpl* self = actor::ActorImpl::self();
   if (self) {
     set_actor(self);
-    self->activities_.emplace_back(this);
+    self->activities_.insert(this);
   }
 }
 
@@ -40,15 +34,7 @@ IoImpl& IoImpl::set_sharing_penalty(double sharing_penalty)
 IoImpl& IoImpl::update_sharing_penalty(double sharing_penalty)
 {
   sharing_penalty_ = sharing_penalty;
-  surf_action_->set_sharing_penalty(sharing_penalty);
-  return *this;
-}
-
-IoImpl& IoImpl::set_timeout(double timeout)
-{
-  const s4u::Host* host = get_disk()->get_host();
-  timeout_detector_     = host->get_cpu()->sleep(timeout);
-  timeout_detector_->set_activity(this);
+  model_action_->set_sharing_penalty(sharing_penalty);
   return *this;
 }
 
@@ -93,50 +79,22 @@ IoImpl* IoImpl::start()
   set_state(State::RUNNING);
   if (dst_host_ == nullptr) {
     XBT_DEBUG("Starting regular I/O");
-    surf_action_ = disk_->io_start(size_, type_);
-    surf_action_->set_sharing_penalty(sharing_penalty_);
+    model_action_ = disk_->io_start(size_, type_);
+    model_action_->set_sharing_penalty(sharing_penalty_);
   } else {
     XBT_DEBUG("Starting streaming I/O");
     auto host_model = dst_host_->get_netpoint()->get_englobing_zone()->get_host_model();
-    surf_action_    = host_model->io_stream(host_, disk_, dst_host_, dst_disk_, size_);
+    model_action_   = host_model->io_stream(host_, disk_, dst_host_, dst_disk_, size_);
   }
 
-  surf_action_->set_activity(this);
-  set_start_time(surf_action_->get_start_time());
+  model_action_->set_activity(this);
+  set_start_time(model_action_->get_start_time());
 
   XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
 
   return this;
 }
 
-void IoImpl::post()
-{
-  performed_ioops_ = surf_action_->get_cost();
-  if (surf_action_->get_state() == resource::Action::State::FAILED) {
-    if (disk_ && not disk_->is_on())
-      set_state(State::FAILED);
-    else
-      set_state(State::CANCELED);
-  } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) {
-    if (surf_action_->get_remains() > 0.0) {
-      surf_action_->set_state(resource::Action::State::FAILED);
-      set_state(State::TIMEOUT);
-    } else {
-      set_state(State::DONE);
-    }
-  } else {
-    set_state(State::DONE);
-  }
-
-  clean_action();
-  if (timeout_detector_) {
-    timeout_detector_->unref();
-    timeout_detector_ = nullptr;
-  }
-
-  /* Answer all simcalls associated with the synchro */
-  finish();
-}
 void IoImpl::set_exception(actor::ActorImpl* issuer)
 {
   switch (get_state()) {
@@ -148,6 +106,12 @@ void IoImpl::set_exception(actor::ActorImpl* issuer)
     case State::CANCELED:
       issuer->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "I/O Canceled"));
       break;
+    case State::SRC_HOST_FAILURE:
+    case State::DST_HOST_FAILURE:
+       issuer->set_wannadie();
+       static_cast<s4u::Io*>(get_iface())->complete(s4u::Activity::State::FAILED);
+       issuer->exception_ = std::make_exception_ptr(StorageFailureException(XBT_THROW_POINT, "Host failed"));
+      break;
     case State::TIMEOUT:
       issuer->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted"));
       break;
@@ -160,6 +124,25 @@ void IoImpl::set_exception(actor::ActorImpl* issuer)
 void IoImpl::finish()
 {
   XBT_DEBUG("IoImpl::finish() in state %s", get_state_str());
+  if (model_action_ != nullptr) {
+    performed_ioops_ = model_action_->get_cost();
+    if (model_action_->get_state() == resource::Action::State::FAILED) {
+      if (host_ && dst_host_) { // this is an I/O stream
+        if (not host_->is_on())
+          set_state(State::SRC_HOST_FAILURE);
+        else if (not dst_host_->is_on())
+          set_state(State::DST_HOST_FAILURE);
+      } else if ((disk_ && not disk_->is_on()) || (dst_disk_ && not dst_disk_->is_on()))
+        set_state(State::FAILED);
+      else
+        set_state(State::CANCELED);
+    } else {
+      set_state(State::DONE);
+    }
+
+    clean_action();
+  }
+
   while (not simcalls_.empty()) {
     actor::Simcall* simcall = simcalls_.front();
     simcalls_.pop_front();
@@ -173,10 +156,16 @@ void IoImpl::finish()
 
     handle_activity_waitany(simcall);
 
-    set_exception(simcall->issuer_);
-
-    simcall->issuer_->waiting_synchro_ = nullptr;
-    simcall->issuer_->simcall_answer();
+    if (not simcall->issuer_->get_host()->is_on()) {
+      simcall->issuer_->set_wannadie();
+    } else {
+      // Do not answer to dying actors
+      if (not simcall->issuer_->wannadie()) {
+        set_exception(simcall->issuer_);
+        simcall->issuer_->waiting_synchro_ = nullptr;
+        simcall->issuer_->simcall_answer();
+      }
+    }
   }
 }