From: Frederic Suter Date: Mon, 18 Feb 2019 22:24:58 +0000 (+0100) Subject: SIMIX_io_finish becomes IoImp::finish X-Git-Tag: v3_22~308 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/239a6c2b5cf6df25b93d95b5df30fb5fbacbfbcd?hp=4141cd9660259caa66e2e9af10873e53402b4812 SIMIX_io_finish becomes IoImp::finish get rid of smx_io* the simcall_handlers will go at the beginning of the kernel/activity/*Impl.cpp --- diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp index 5fac5af006..b96036d15e 100644 --- a/src/kernel/activity/IoImpl.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -2,13 +2,37 @@ /* 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(synchro)->finish(); + return; + } + + /* If the synchro is already finished then perform the error handling */ + if (synchro->state_ != SIMIX_RUNNING) + boost::static_pointer_cast(synchro)->finish(); +} + namespace simgrid { namespace kernel { namespace activity { @@ -67,8 +91,36 @@ void 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(state_)); + } + + simcall->issuer->waiting_synchro = nullptr; + if (simcall->issuer->get_host()->is_on()) + SIMIX_simcall_answer(simcall); + else + simcall->issuer->context_->iwannadie = true; + } +} + /************* * Callbacks * *************/ diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp index dd4ecebea5..f7f2217ffc 100644 --- a/src/kernel/activity/IoImpl.hpp +++ b/src/kernel/activity/IoImpl.hpp @@ -21,6 +21,7 @@ public: IoImpl* start(sg_size_t size, simgrid::s4u::Io::OpType type); void post() override; + void finish(); void cancel(); double get_remaining(); sg_size_t get_performed_ioops() { return performed_ioops_; } diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp index 86d6303c57..52f55b4322 100644 --- a/src/s4u/s4u_Io.cpp +++ b/src/s4u/s4u_Io.cpp @@ -6,7 +6,6 @@ #include "simgrid/s4u/Io.hpp" #include "simgrid/s4u/Storage.hpp" #include "src/kernel/activity/IoImpl.hpp" -#include "src/simix/smx_io_private.hpp" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs"); diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index a966e2603d..3b42e4c566 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -16,7 +16,6 @@ #include "src/mc/mc_replay.hpp" #include "src/mc/remote/Client.hpp" #include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_io_private.hpp" #include "src/simix/smx_synchro_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 3fdd843db9..247dd903c5 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -21,7 +21,6 @@ #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_io_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp deleted file mode 100644 index 4b8ecbc42f..0000000000 --- a/src/simix/smx_io.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright (c) 2007-2019. 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. */ - -#include "mc/mc.h" -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Io.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/StorageImpl.hpp" - -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; - SIMIX_io_finish(synchro); - return; - } - - /* 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) -{ - for (smx_simcall_t const& simcall : synchro->simcalls_) { - switch (synchro->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(synchro->state_)); - } - - simcall->issuer->waiting_synchro = nullptr; - if (simcall->issuer->get_host()->is_on()) - SIMIX_simcall_answer(simcall); - else - simcall->issuer->context_->iwannadie = true; - } -} diff --git a/src/simix/smx_io_private.hpp b/src/simix/smx_io_private.hpp deleted file mode 100644 index 8cf9f003b2..0000000000 --- a/src/simix/smx_io_private.hpp +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2007-2019. 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. */ - -#ifndef SIMIX_IO_PRIVATE_HPP -#define SIMIX_IO_PRIVATE_HPP - -#include -#include "simgrid/s4u/Io.hpp" - -XBT_PRIVATE void SIMIX_io_finish(smx_activity_t synchro); - -#endif diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 67c4fe84d9..dd534b7a2c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -26,7 +26,6 @@ set(EXTRA_DIST src/simix/popping_enum.h src/simix/popping_accessors.hpp src/simix/smx_host_private.hpp - src/simix/smx_io_private.hpp src/simix/smx_private.hpp src/simix/smx_synchro_private.hpp src/smpi/colls/coll_tuned_topo.hpp @@ -387,7 +386,6 @@ set(SIMIX_SRC src/simix/smx_environment.cpp src/simix/smx_global.cpp src/simix/smx_host.cpp - src/simix/smx_io.cpp src/simix/smx_network.cpp src/simix/ActorImpl.cpp src/simix/ActorImpl.hpp