X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9478b64da2f09f9bd3f996a173da98d47f9c7b4c..42ec07cc0c4fb24df86b22c97bfbeab2f0a21c8e:/src/kernel/activity/IoImpl.cpp

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 63f5381293..80fd2f0654 100644
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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. */
@@ -10,29 +10,22 @@
 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/smx_private.hpp"
-#include "src/surf/StorageImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
 
 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)
-{
-  XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
-
-  /* Associate this simcall to the synchro */
-  synchro->register_simcall(simcall);
-
-  if (MC_is_active() || MC_record_replay_is_active())
-    synchro->state_ = SIMIX_DONE;
-
-  /* If the synchro is already finished then perform the error handling */
-  if (synchro->state_ != SIMIX_RUNNING)
-    synchro->finish();
-}
-
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
+IoImpl& IoImpl::set_timeout(double timeout)
+{
+  const s4u::Host* host = get_disk()->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;
@@ -51,23 +44,13 @@ IoImpl& IoImpl::set_disk(resource::DiskImpl* disk)
   return *this;
 }
 
-IoImpl& IoImpl::set_storage(resource::StorageImpl* storage)
-{
-  storage_ = storage;
-  return *this;
-}
-
 IoImpl* IoImpl::start()
 {
-  state_       = SIMIX_RUNNING;
-  if (storage_)
-    surf_action_ = storage_->io_start(size_, type_);
-  else
-    surf_action_ = disk_->io_start(size_, type_);
+  state_ = State::RUNNING;
+  surf_action_ = disk_->io_start(size_, type_);
   surf_action_->set_activity(this);
 
   XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
-  IoImpl::on_start(*this);
 
   return this;
 }
@@ -76,14 +59,26 @@ void IoImpl::post()
 {
   performed_ioops_ = surf_action_->get_cost();
   if (surf_action_->get_state() == resource::Action::State::FAILED) {
-    if ((storage_ && not storage_->is_on()) || (disk_ && not disk_->is_on()))
-      state_ = SIMIX_FAILED;
+    if (disk_ && not disk_->is_on())
+      state_ = State::FAILED;
     else
-      state_ = SIMIX_CANCELED;
-  } else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
-    state_ = SIMIX_DONE;
+      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);
+      state_ = State::TIMEOUT;
+    } else {
+      state_ = State::DONE;
+    }
+  } else {
+    state_ = State::DONE;
+  }
+
+  clean_action();
+  if (timeout_detector_) {
+    timeout_detector_->unref();
+    timeout_detector_ = nullptr;
   }
-  on_completion(*this);
 
   /* Answer all simcalls associated with the synchro */
   finish();
@@ -92,35 +87,33 @@ void IoImpl::post()
 void IoImpl::finish()
 {
   while (not simcalls_.empty()) {
-    smx_simcall_t simcall = simcalls_.front();
+    const s_smx_simcall* simcall = simcalls_.front();
     simcalls_.pop_front();
     switch (state_) {
-      case SIMIX_DONE:
+      case State::DONE:
         /* do nothing, synchro done */
         break;
-      case SIMIX_FAILED:
-        simcall->issuer_->context_->iwannadie = true;
+      case State::FAILED:
+        simcall->issuer_->context_->set_wannadie();
         simcall->issuer_->exception_ =
             std::make_exception_ptr(StorageFailureException(XBT_THROW_POINT, "Storage failed"));
         break;
-      case SIMIX_CANCELED:
+      case State::CANCELED:
         simcall->issuer_->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "I/O Canceled"));
         break;
+      case State::TIMEOUT:
+        XBT_DEBUG("IoImpl::finish(): execution timeouted");
+        simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"));
+        break;
       default:
         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