From 41efdce0277c52d55f27af300df9821cbd18c12c Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 10 Feb 2020 15:55:25 +0100 Subject: [PATCH] Define {Exec,Io}Impl::wait_for(). --- src/kernel/activity/ExecImpl.cpp | 60 +++++++++++++++-------------- src/kernel/activity/ExecImpl.hpp | 1 + src/kernel/activity/IoImpl.cpp | 66 +++++++++++++++++--------------- src/kernel/activity/IoImpl.hpp | 1 + 4 files changed, 69 insertions(+), 59 deletions(-) diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index e3d9d322c0..fc685eda24 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -19,34 +19,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro, double timeout) { - XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_); - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - - /* Associate this simcall to the synchro */ - synchro->register_simcall(simcall); - - /* set surf's synchro */ - if (MC_is_active() || MC_record_replay_is_active()) { - int idx = SIMCALL_GET_MC_VALUE(*simcall); - if (idx == 0) { - synchro->state_ = simgrid::kernel::activity::State::DONE; - } else { - /* If we reached this point, the wait simcall must have a timeout */ - /* Otherwise it shouldn't be enabled and executed by the MC */ - if (timeout < 0.0) - THROW_IMPOSSIBLE; - synchro->state_ = simgrid::kernel::activity::State::TIMEOUT; - } - synchro->finish(); - return; - } - - /* If the synchro is already finished then perform the error handling */ - if (synchro->state_ != simgrid::kernel::activity::State::RUNNING) { - synchro->finish(); - } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */ - synchro->set_timeout(timeout); - } + synchro->wait_for(simcall->issuer_, timeout); } void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[], @@ -147,6 +120,37 @@ ExecImpl* ExecImpl::start() return this; } +void ExecImpl::wait_for(actor::ActorImpl* issuer, double timeout) +{ + XBT_DEBUG("Wait for execution of synchro %p, state %d", this, (int)state_); + xbt_assert(std::isfinite(timeout), "timeout is not finite!"); + + /* Associate this simcall to the synchro */ + register_simcall(&issuer->simcall); + + if (MC_is_active() || MC_record_replay_is_active()) { + int idx = SIMCALL_GET_MC_VALUE(issuer->simcall); + if (idx == 0) { + state_ = simgrid::kernel::activity::State::DONE; + } else { + /* If we reached this point, the wait simcall must have a timeout */ + /* Otherwise it shouldn't be enabled and executed by the MC */ + if (timeout < 0.0) + THROW_IMPOSSIBLE; + state_ = simgrid::kernel::activity::State::TIMEOUT; + } + finish(); + return; + } + + /* If the synchro is already finished then perform the error handling */ + if (state_ != simgrid::kernel::activity::State::RUNNING) { + finish(); + } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */ + set_timeout(timeout); + } +} + double ExecImpl::get_seq_remaining_ratio() { return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp index fe4b94a120..7d4a915ecf 100644 --- a/src/kernel/activity/ExecImpl.hpp +++ b/src/kernel/activity/ExecImpl.hpp @@ -42,6 +42,7 @@ public: virtual ActivityImpl* migrate(s4u::Host* to); ExecImpl* start(); + void wait_for(actor::ActorImpl* issuer, double timeout); void post() override; void finish() override; diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp index 53029d1930..9a2e3f0e37 100644 --- a/src/kernel/activity/IoImpl.cpp +++ b/src/kernel/activity/IoImpl.cpp @@ -17,37 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io) void simcall_HANDLER_io_wait(smx_simcall_t simcall, simgrid::kernel::activity::IoImpl* synchro, double timeout) { - XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_); - - /* Associate this simcall to the synchro */ - synchro->register_simcall(simcall); - - if (MC_is_active() || MC_record_replay_is_active()) { - int idx = SIMCALL_GET_MC_VALUE(*simcall); - if (idx == 0) { - synchro->state_ = simgrid::kernel::activity::State::DONE; - } else { - /* If we reached this point, the wait simcall must have a timeout */ - /* Otherwise it shouldn't be enabled and executed by the MC */ - if (timeout < 0.0) - THROW_IMPOSSIBLE; - synchro->state_ = simgrid::kernel::activity::State::TIMEOUT; - } - synchro->finish(); - return; - } - - /* If the synchro is already finished then perform the error handling */ - if (synchro->state_ != simgrid::kernel::activity::State::RUNNING) - synchro->finish(); - else { - /* we need a sleep action (even when there is no timeout) to be notified of host failures */ - if (synchro->get_disk() != nullptr) - synchro->set_timeout_detector(synchro->get_disk()->get_host()->pimpl_cpu->sleep(timeout)); - else - synchro->set_timeout_detector( - simgrid::s4u::Host::by_name(synchro->get_storage()->get_host())->pimpl_cpu->sleep(timeout)); - } + synchro->wait_for(simcall->issuer_, timeout); } namespace simgrid { @@ -93,6 +63,40 @@ IoImpl* IoImpl::start() return this; } +void IoImpl::wait_for(actor::ActorImpl* issuer, double timeout) +{ + XBT_DEBUG("Wait for execution of synchro %p, state %d", this, (int)state_); + + /* Associate this simcall to the synchro */ + register_simcall(&issuer->simcall); + + if (MC_is_active() || MC_record_replay_is_active()) { + int idx = SIMCALL_GET_MC_VALUE(issuer->simcall); + if (idx == 0) { + state_ = simgrid::kernel::activity::State::DONE; + } else { + /* If we reached this point, the wait simcall must have a timeout */ + /* Otherwise it shouldn't be enabled and executed by the MC */ + if (timeout < 0.0) + THROW_IMPOSSIBLE; + state_ = simgrid::kernel::activity::State::TIMEOUT; + } + finish(); + return; + } + + /* If the synchro is already finished then perform the error handling */ + if (state_ != simgrid::kernel::activity::State::RUNNING) + finish(); + else { + /* we need a sleep action (even when there is no timeout) to be notified of host failures */ + if (get_disk() != nullptr) + set_timeout_detector(get_disk()->get_host()->pimpl_cpu->sleep(timeout)); + else + set_timeout_detector(simgrid::s4u::Host::by_name(get_storage()->get_host())->pimpl_cpu->sleep(timeout)); + } +} + void IoImpl::post() { performed_ioops_ = surf_action_->get_cost(); diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp index 0b885d3441..ac5c395f2a 100644 --- a/src/kernel/activity/IoImpl.hpp +++ b/src/kernel/activity/IoImpl.hpp @@ -39,6 +39,7 @@ public: resource::StorageImpl* get_storage() const { return storage_; } IoImpl* start(); + void wait_for(actor::ActorImpl* issuer, double timeout); void post() override; void finish() override; -- 2.20.1