Replaced std::list by std::set to keep track of activities

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

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 339b91a..503f2e6 100644 (file)
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -27,7 +27,7 @@ IoImpl::IoImpl()
   actor::ActorImpl* self = actor::ActorImpl::self();
   if (self) {
     set_actor(self);
-    self->activities_.emplace_back(this);
+    self->activities_.insert(this);
   }
 }
 
@@ -103,7 +103,6 @@ IoImpl* IoImpl::start()
 
   surf_action_->set_activity(this);
   set_start_time(surf_action_->get_start_time());
-#include "src/surf/HostImpl.hpp"
 
   XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
 
@@ -114,7 +113,12 @@ void IoImpl::post()
 {
   performed_ioops_ = surf_action_->get_cost();
   if (surf_action_->get_state() == resource::Action::State::FAILED) {
-    if (disk_ && not disk_->is_on())
+    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);
@@ -149,6 +153,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;
@@ -174,10 +184,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();
+      }
+    }
   }
 }