X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4141cd9660259caa66e2e9af10873e53402b4812..93ae3804979dbbefc774e5a70acc32a4407dd7e8:/src/kernel/activity/IoImpl.cpp

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 5fac5af006..822ff10cea 100644
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -2,24 +2,41 @@
 
 /* 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 "src/kernel/activity/IoImpl.hpp"
+#include "mc/mc.h"
+#include "simgrid/Exception.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
-#include "src/simix/smx_io_private.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_private.hpp"
 #include "src/surf/StorageImpl.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_io);
-namespace simgrid {
-namespace kernel {
-namespace activity {
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 
-IoImpl::IoImpl(std::string name, surf::StorageImpl* storage) : ActivityImpl(std::move(name)), storage_(storage)
+void simcall_HANDLER_io_wait(smx_simcall_t simcall, simgrid::kernel::activity::IoImpl* synchro)
 {
-  this->state_ = SIMIX_RUNNING;
+  XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
+
+  /* Associate this simcall to the synchro */
+  synchro->simcalls_.push_back(simcall);
+  simcall->issuer->waiting_synchro = synchro;
 
-  XBT_DEBUG("Create io impl %p", this);
+  /* set surf's synchro */
+  if (MC_is_active() || MC_record_replay_is_active()) {
+    synchro->state_ = SIMIX_DONE;
+    synchro->finish();
+    return;
+  }
+
+  /* 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()
 {
   if (surf_action_ != nullptr)
@@ -27,13 +44,38 @@ IoImpl::~IoImpl()
   XBT_DEBUG("Destroy io %p", this);
 }
 
-IoImpl* IoImpl::start(sg_size_t size, simgrid::s4u::Io::OpType type)
+IoImplPtr IoImpl::set_name(const std::string& name)
+{
+  ActivityImpl::set_name(name);
+  return this;
+}
+
+IoImplPtr IoImpl::set_type(s4u::Io::OpType type)
+{
+  type_ = type;
+  return this;
+}
+
+IoImplPtr IoImpl::set_size(sg_size_t size)
 {
-  surf_action_ = storage_->io_start(size, type);
+  size_ = size;
+  return this;
+}
+
+IoImplPtr IoImpl::set_storage(resource::StorageImpl* storage)
+{
+  storage_ = storage;
+  return this;
+}
+
+IoImpl* IoImpl::start()
+{
+  state_       = SIMIX_RUNNING;
+  surf_action_ = storage_->io_start(size_, type_);
   surf_action_->set_data(this);
 
   XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
-  simgrid::kernel::activity::IoImpl::on_start(this);
+  IoImpl::on_start(this);
 
   return this;
 }
@@ -55,20 +97,47 @@ void IoImpl::post()
 {
   performed_ioops_ = surf_action_->get_cost();
   switch (surf_action_->get_state()) {
-    case simgrid::kernel::resource::Action::State::FAILED:
+    case resource::Action::State::FAILED:
       state_ = SIMIX_FAILED;
       break;
-    case simgrid::kernel::resource::Action::State::FINISHED:
+    case resource::Action::State::FINISHED:
       state_ = SIMIX_DONE;
       break;
     default:
       THROW_IMPOSSIBLE;
-      break;
   }
   on_completion(this);
 
-  SIMIX_io_finish(this);
+  finish();
+}
+
+void IoImpl::finish()
+{
+  for (smx_simcall_t const& simcall : simcalls_) {
+    switch (state_) {
+      case SIMIX_DONE:
+        /* do nothing, synchro done */
+        break;
+      case SIMIX_FAILED:
+        simcall->issuer->exception_ =
+            std::make_exception_ptr(simgrid::StorageFailureException(XBT_THROW_POINT, "Storage failed"));
+        break;
+      case SIMIX_CANCELED:
+        simcall->issuer->exception_ =
+            std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "I/O Canceled"));
+        break;
+      default:
+        xbt_die("Internal error in IoImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
+    }
+
+    simcall->issuer->waiting_synchro = nullptr;
+    if (simcall->issuer->get_host()->is_on())
+      SIMIX_simcall_answer(simcall);
+    else
+      simcall->issuer->context_->iwannadie = true;
+  }
 }
+
 /*************
  * Callbacks *
  *************/