Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
No need to answer to simcall when host is off.
[simgrid.git] / src / simix / smx_io.cpp
index 7393fb3..24947e8 100644 (file)
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 
-simgrid::kernel::activity::IoImplPtr SIMIX_io_start(std::string name, sg_size_t size, sg_storage_t storage,
-                                                    simgrid::s4u::Io::OpType type)
-{
-  /* set surf's action */
-  simgrid::kernel::resource::Action* surf_action = storage->get_impl()->io_start(size, type);
-
-  simgrid::kernel::activity::IoImplPtr io =
-      simgrid::kernel::activity::IoImplPtr(new simgrid::kernel::activity::IoImpl(name, surf_action, storage));
-
-  XBT_DEBUG("Create IO synchro %p %s", io.get(), name.c_str());
-  simgrid::kernel::activity::IoImpl::on_creation(io);
-
-  return 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_);
@@ -68,11 +53,10 @@ 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;
-    }
-
     simcall->issuer->waiting_synchro = nullptr;
-    SIMIX_simcall_answer(simcall);
+    if (simcall->issuer->host_->is_off())
+      simcall->issuer->context_->iwannadie = true;
+    else
+      SIMIX_simcall_answer(simcall);
   }
 }