From 20e80e0441190a30ffdce39c11e8a947fb9d63b5 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 30 May 2018 09:27:48 +0200 Subject: [PATCH] cosmetics --- .../activity/{SynchroIo.cpp => IoImpl.cpp} | 16 ++++++++-------- .../activity/{SynchroIo.hpp => IoImpl.hpp} | 9 +++++---- src/simix/ActorImpl.cpp | 2 +- src/simix/popping.cpp | 2 +- src/simix/smx_global.cpp | 3 ++- src/simix/smx_io.cpp | 16 ++++++++-------- tools/cmake/DefinePackages.cmake | 4 ++-- 7 files changed, 27 insertions(+), 25 deletions(-) rename src/kernel/activity/{SynchroIo.cpp => IoImpl.cpp} (73%) rename src/kernel/activity/{SynchroIo.hpp => IoImpl.hpp} (83%) diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/IoImpl.cpp similarity index 73% rename from src/kernel/activity/SynchroIo.cpp rename to src/kernel/activity/IoImpl.cpp index b1534848d2..eb61b839f3 100644 --- a/src/kernel/activity/SynchroIo.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -3,20 +3,20 @@ /* 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/SynchroIo.hpp" +#include "src/kernel/activity/IoImpl.hpp" #include "simgrid/kernel/resource/Action.hpp" #include "src/simix/smx_io_private.hpp" void simgrid::kernel::activity::IoImpl::suspend() { - if (surf_io) - surf_io->suspend(); + if (surf_action_ != nullptr) + surf_action_->suspend(); } void simgrid::kernel::activity::IoImpl::resume() { - if (surf_io) - surf_io->resume(); + if (surf_action_ != nullptr) + surf_action_->resume(); } void simgrid::kernel::activity::IoImpl::post() @@ -24,17 +24,17 @@ void simgrid::kernel::activity::IoImpl::post() for (smx_simcall_t const& simcall : simcalls_) { switch (simcall->call) { case SIMCALL_STORAGE_WRITE: - simcall_storage_write__set__result(simcall, surf_io->get_cost()); + simcall_storage_write__set__result(simcall, surf_action_->get_cost()); break; case SIMCALL_STORAGE_READ: - simcall_storage_read__set__result(simcall, surf_io->get_cost()); + simcall_storage_read__set__result(simcall, surf_action_->get_cost()); break; default: break; } } - switch (surf_io->get_state()) { + switch (surf_action_->get_state()) { case simgrid::kernel::resource::Action::State::FAILED: state_ = SIMIX_FAILED; break; diff --git a/src/kernel/activity/SynchroIo.hpp b/src/kernel/activity/IoImpl.hpp similarity index 83% rename from src/kernel/activity/SynchroIo.hpp rename to src/kernel/activity/IoImpl.hpp index 03efd48fc0..71f1a45377 100644 --- a/src/kernel/activity/SynchroIo.hpp +++ b/src/kernel/activity/IoImpl.hpp @@ -19,9 +19,10 @@ public: void resume() override; void post() override; - simgrid::kernel::resource::Action* surf_io = nullptr; - }; - -}}} // namespace simgrid::kernel::activity + simgrid::kernel::resource::Action* surf_action_ = nullptr; +}; +} +} +} // namespace simgrid::kernel::activity #endif diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index bbea0fc328..96aac00178 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -5,8 +5,8 @@ #include "mc/mc.h" #include "smx_private.hpp" +#include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_replay.hpp" #include "src/mc/remote/Client.hpp" diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index 66e426ff6b..2fdbeb8459 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.cpp @@ -11,8 +11,8 @@ #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix, diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index cff64ddc02..667e50aea7 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -6,10 +6,11 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" + +#include "../kernel/activity/IoImpl.hpp" #include "simgrid/sg_config.hpp" #include "smx_private.hpp" #include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.hpp" diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 9e6591f9e5..b114804429 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -9,15 +9,15 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" + #include "smx_private.hpp" +#include "src/kernel/activity/IoImpl.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) @@ -30,9 +30,9 @@ void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_s 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); + synchro->surf_action_ = st->read(size); - synchro->surf_io->set_data(synchro); + synchro->surf_action_->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -48,8 +48,8 @@ void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_ 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); + synchro->surf_action_ = st->write(size); + synchro->surf_action_->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -59,8 +59,8 @@ void SIMIX_io_destroy(smx_activity_t synchro) { simgrid::kernel::activity::IoImplPtr io = boost::static_pointer_cast(synchro); XBT_DEBUG("Destroy synchro %p", synchro.get()); - if (io->surf_io) - io->surf_io->unref(); + if (io->surf_action_) + io->surf_action_->unref(); } void SIMIX_io_finish(smx_activity_t synchro) diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 337e7412ad..cb2889f281 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -391,14 +391,14 @@ set(SIMIX_SRC src/kernel/activity/CommImpl.hpp src/kernel/activity/ExecImpl.cpp src/kernel/activity/ExecImpl.hpp + src/kernel/activity/IoImpl.cpp + src/kernel/activity/IoImpl.hpp src/kernel/activity/MailboxImpl.cpp src/kernel/activity/MailboxImpl.hpp src/kernel/activity/MutexImpl.cpp src/kernel/activity/MutexImpl.hpp src/kernel/activity/SleepImpl.cpp src/kernel/activity/SleepImpl.hpp - src/kernel/activity/SynchroIo.cpp - src/kernel/activity/SynchroIo.hpp src/kernel/activity/SynchroRaw.cpp src/kernel/activity/SynchroRaw.hpp -- 2.20.1