X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd05e77cf9fe231aef1608d42c8e45ac3ee5c15c..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/simix/smx_io.cpp

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index 9e6591f9e5..98d4b230d4 100644
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -3,64 +3,52 @@
 /* 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 <xbt/ex.hpp>
-#include <xbt/sysdep.h>
-#include <xbt/log.h>
-
+#include "mc/mc.h"
 #include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Storage.hpp"
+#include "simgrid/s4u/Io.hpp"
+#include "xbt/ex.hpp"
+
 #include "smx_private.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
+#include "src/mc/mc_replay.hpp"
 #include "src/simix/smx_io_private.hpp"
-#include "src/surf/HostImpl.hpp"
 #include "src/surf/StorageImpl.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
-
-#include "src/kernel/activity/SynchroIo.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 
-void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
+simgrid::kernel::activity::IoImplPtr SIMIX_io_start(std::string name, sg_size_t size, sg_storage_t storage,
+                                                    simgrid::s4u::Io::OpType type)
 {
-  smx_activity_t synchro = SIMIX_storage_read(st, size);
-  synchro->simcalls_.push_back(simcall);
-  simcall->issuer->waiting_synchro = synchro;
-}
+  /* set surf's action */
+  simgrid::kernel::resource::Action* surf_action = storage->get_impl()->io_start(size, type);
 
-smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size)
-{
-  simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
-  synchro->surf_io                           = st->read(size);
+  simgrid::kernel::activity::IoImplPtr io =
+      simgrid::kernel::activity::IoImplPtr(new simgrid::kernel::activity::IoImpl(name, surf_action, storage));
 
-  synchro->surf_io->set_data(synchro);
-  XBT_DEBUG("Create io synchro %p", synchro);
+  XBT_DEBUG("Create IO synchro %p %s", io.get(), name.c_str());
+  simgrid::kernel::activity::IoImpl::on_creation(io);
 
-  return synchro;
+  return io;
 }
 
-void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
+void simcall_HANDLER_io_wait(smx_simcall_t simcall, smx_activity_t synchro)
 {
-  smx_activity_t synchro = SIMIX_storage_write(st, size);
+  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;
-}
-
-smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size)
-{
-  simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
-  synchro->surf_io                           = st->write(size);
-  synchro->surf_io->set_data(synchro);
-  XBT_DEBUG("Create io synchro %p", synchro);
 
-  return synchro;
-}
+  /* set surf's synchro */
+  if (MC_is_active() || MC_record_replay_is_active()) {
+    synchro->state_ = SIMIX_DONE;
+    SIMIX_io_finish(synchro);
+    return;
+  }
 
-void SIMIX_io_destroy(smx_activity_t synchro)
-{
-  simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(synchro);
-  XBT_DEBUG("Destroy synchro %p", synchro.get());
-  if (io->surf_io)
-    io->surf_io->unref();
+  /* If the synchro is already finished then perform the error handling */
+  if (synchro->state_ != SIMIX_RUNNING)
+    SIMIX_io_finish(synchro);
 }
 
 void SIMIX_io_finish(smx_activity_t synchro)
@@ -80,14 +68,11 @@ void SIMIX_io_finish(smx_activity_t synchro)
         xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state_));
     }
 
-    if (simcall->issuer->host->is_off()) {
-      simcall->issuer->context->iwannadie = 1;
+    if (simcall->issuer->host_->is_off()) {
+      simcall->issuer->context_->iwannadie = 1;
     }
 
     simcall->issuer->waiting_synchro = nullptr;
     SIMIX_simcall_answer(simcall);
   }
-
-  /* We no longer need it */
-  SIMIX_io_destroy(synchro);
 }