X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d07491b881cc0dd542507d598e1099f178b79c59..001737a15701027974d89260771284a45013d2cd:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 83e7e88da5..4b66dd21bb 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -3,29 +3,58 @@ /* 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/ExecImpl.hpp" +#include "simgrid/Exception.hpp" #include "simgrid/modelchecker.h" #include "src/mc/mc_replay.hpp" - -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/simix/smx_host_private.hpp" -#include "src/surf/surf_interface.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" +#include "src/surf/surf_interface.hpp" #include "simgrid/s4u/Host.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); + +void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro) +{ + XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (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; + synchro->finish(); + return; + } + + /* If the synchro is already finished then perform the error handling */ + if (synchro->state_ != SIMIX_RUNNING) + synchro->finish(); +} + +void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro) +{ + int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); + if (res) { + synchro->simcalls_.push_back(simcall); + synchro->finish(); + } else { + SIMIX_simcall_answer(simcall); + } + simcall_execution_test__set__result(simcall, res); +} + namespace simgrid { namespace kernel { namespace activity { -ExecImpl::ExecImpl(std::string name, std::string tracing_category, resource::Action* timeout_detector, s4u::Host* host) - : ActivityImpl(std::move(name)), host_(host), timeout_detector_(timeout_detector) +ExecImpl::ExecImpl(const std::string& name, const std::string& tracing_category) : ActivityImpl(name) { this->state_ = SIMIX_RUNNING; - this->set_category(std::move(tracing_category)); - - if (timeout_detector != nullptr) - timeout_detector_->set_data(this); + this->set_category(tracing_category); XBT_DEBUG("Create exec %p", this); } @@ -39,6 +68,21 @@ ExecImpl::~ExecImpl() XBT_DEBUG("Destroy exec %p", this); } +ExecImpl* ExecImpl::set_host(s4u::Host* host) +{ + host_ = host; + return this; +} + +ExecImpl* ExecImpl::set_timeout(double timeout) +{ + if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) { + timeout_detector_ = host_->pimpl_cpu->sleep(timeout); + timeout_detector_->set_data(this); + } + return this; +} + ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound) { if (not MC_is_active() && not MC_record_replay_is_active()) { @@ -54,6 +98,20 @@ ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound) return this; } +ExecImpl* ExecImpl::start(const std::vector& hosts, const std::vector& flops_amounts, + const std::vector& bytes_amounts) +{ + /* set surf's synchro */ + if (not MC_is_active() && not MC_record_replay_is_active()) { + surf_action_ = surf_host_model->execute_parallel(hosts, flops_amounts.data(), bytes_amounts.data(), -1); + if (surf_action_ != nullptr) { + surf_action_->set_data(this); + } + } + XBT_DEBUG("Create parallel execute synchro %p", this); + ExecImpl::on_creation(this); + return this; +} void ExecImpl::cancel() { XBT_VERB("This exec %p is canceled", this); @@ -63,19 +121,18 @@ void ExecImpl::cancel() double ExecImpl::get_remaining() { - xbt_assert(host_ != nullptr, "Calling remains() on a parallel execution is not allowed. " - "We would need to return a vector instead of a scalar. " - "Did you mean remainingRatio() instead?"); return surf_action_ ? surf_action_->get_remains() : 0; } -double ExecImpl::get_remaining_ratio() +double ExecImpl::get_seq_remaining_ratio() { - if (host_ == - nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::get_remaining()) - return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains(); - else // Actually compute the ratio for sequential tasks - return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost(); +} + +double ExecImpl::get_par_remaining_ratio() +{ + // parallel task: their remain is already between 0 and 1 + return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains(); } void ExecImpl::set_bound(double bound) @@ -117,10 +174,57 @@ void ExecImpl::post() /* If there are simcalls associated with the synchro, then answer them */ if (not simcalls_.empty()) - SIMIX_execution_finish(this); + finish(); +} + +void ExecImpl::finish() +{ + while (not simcalls_.empty()) { + smx_simcall_t simcall = simcalls_.front(); + simcalls_.pop_front(); + switch (state_) { + + case SIMIX_DONE: + /* do nothing, synchro done */ + XBT_DEBUG("ExecImpl::finish(): execution successful"); + break; + + case SIMIX_FAILED: + XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname()); + simcall->issuer->context_->iwannadie = true; + if (simcall->issuer->get_host()->is_on()) + simcall->issuer->exception_ = + std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); + /* else, the actor will be killed with no possibility to survive */ + break; + + case SIMIX_CANCELED: + XBT_DEBUG("ExecImpl::finish(): execution canceled"); + simcall->issuer->exception_ = + std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled")); + break; + + case SIMIX_TIMEOUT: + XBT_DEBUG("ExecImpl::finish(): execution timeouted"); + simcall->issuer->exception_ = std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Timeouted")); + break; + + default: + xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast(state_)); + } + + simcall->issuer->waiting_synchro = nullptr; + simcall_execution_wait__set__result(simcall, state_); + + /* Fail the process if the host is down */ + if (simcall->issuer->get_host()->is_on()) + SIMIX_simcall_answer(simcall); + else + simcall->issuer->context_->iwannadie = true; + } } -ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to) +ActivityImpl* ExecImpl::migrate(s4u::Host* to) { if (not MC_is_active() && not MC_record_replay_is_active()) { resource::Action* old_action = this->surf_action_;