X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d662c9d9b90723961229e619d980e28d2d66ef6d..239a6c2b5cf6df25b93d95b5df30fb5fbacbfbcd:/src/kernel/activity/IoImpl.cpp

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 00fa1b4824..b96036d15e 100644
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -2,51 +2,80 @@
 
 /* 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);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
+
+void simcall_HANDLER_io_wait(smx_simcall_t simcall, smx_activity_t synchro)
+{
+  XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_);
+
+  /* Associate this simcall to the synchro */
+  synchro->simcalls_.push_back(simcall);
+  simcall->issuer->waiting_synchro = synchro;
+
+  /* set surf's synchro */
+  if (MC_is_active() || MC_record_replay_is_active()) {
+    synchro->state_ = SIMIX_DONE;
+    boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro)->finish();
+    return;
+  }
+
+  /* If the synchro is already finished then perform the error handling */
+  if (synchro->state_ != SIMIX_RUNNING)
+    boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro)->finish();
+}
+
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-simgrid::kernel::activity::IoImpl::IoImpl(std::string name, simgrid::surf::StorageImpl* storage)
-    : ActivityImpl(name), storage_(storage)
+IoImpl::IoImpl(std::string name, surf::StorageImpl* storage) : ActivityImpl(std::move(name)), storage_(storage)
 {
   this->state_ = SIMIX_RUNNING;
 
   XBT_DEBUG("Create io impl %p", this);
 }
 
-simgrid::kernel::activity::IoImpl::~IoImpl()
+IoImpl::~IoImpl()
 {
   if (surf_action_ != nullptr)
     surf_action_->unref();
   XBT_DEBUG("Destroy io %p", this);
 }
 
-void simgrid::kernel::activity::IoImpl::start(sg_size_t size, simgrid::s4u::Io::OpType type)
+IoImpl* IoImpl::start(sg_size_t size, simgrid::s4u::Io::OpType type)
 {
   surf_action_ = storage_->io_start(size, type);
   surf_action_->set_data(this);
 
-  XBT_DEBUG("Create IO synchro %p %s", this, name_.c_str());
+  XBT_DEBUG("Create IO synchro %p %s", this, get_cname());
   simgrid::kernel::activity::IoImpl::on_start(this);
+
+  return this;
 }
 
-void simgrid::kernel::activity::IoImpl::cancel()
+void IoImpl::cancel()
 {
   XBT_VERB("This exec %p is canceled", this);
   if (surf_action_ != nullptr)
     surf_action_->cancel();
+  state_ = SIMIX_CANCELED;
 }
 
-double simgrid::kernel::activity::IoImpl::get_remaining()
+double IoImpl::get_remaining()
 {
   return surf_action_ ? surf_action_->get_remains() : 0;
 }
 
-void simgrid::kernel::activity::IoImpl::post()
+void IoImpl::post()
 {
   performed_ioops_ = surf_action_->get_cost();
   switch (surf_action_->get_state()) {
@@ -62,10 +91,42 @@ void simgrid::kernel::activity::IoImpl::post()
   }
   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 SIMIX_io_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 *
  *************/
-simgrid::xbt::signal<void(simgrid::kernel::activity::IoImplPtr)> simgrid::kernel::activity::IoImpl::on_start;
-simgrid::xbt::signal<void(simgrid::kernel::activity::IoImplPtr)> simgrid::kernel::activity::IoImpl::on_completion;
+xbt::signal<void(IoImplPtr)> IoImpl::on_start;
+xbt::signal<void(IoImplPtr)> IoImpl::on_completion;
+
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid