X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..64a60fa58ca5dc30df8b2780c4901773f219d8ea:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index a210ab0ef1..460edbc072 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -1,11 +1,14 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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 "src/kernel/activity/ExecImpl.hpp" #include "simgrid/Exception.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/modelchecker.h" +#include "simgrid/s4u/Exec.hpp" +#include "src/mc/checker/SimcallObserver.hpp" #include "src/mc/mc_replay.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" @@ -13,89 +16,25 @@ #include "simgrid/s4u/Host.hpp" -#include - 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->register_simcall(simcall); - - /* 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) -{ - bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); - if (res) { - synchro->simcalls_.push_back(simcall); - synchro->finish(); - } else { - simcall->issuer_->simcall_answer(); - } - simcall_execution_test__set__result(simcall, res); -} - -void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[], - size_t count, double timeout) -{ - if (timeout < 0.0) { - simcall->timeout_cb_ = nullptr; - } else { - simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() { - for (size_t i = 0; i < count; i++) { - // Remove the first occurence of simcall: - auto* exec = execs[i]; - auto j = boost::range::find(exec->simcalls_, simcall); - if (j != exec->simcalls_.end()) - exec->simcalls_.erase(j); - } - simcall_execution_waitany_for__set__result(simcall, -1); - simcall->issuer_->simcall_answer(); - }); - } - - for (size_t i = 0; i < count; i++) { - /* associate this simcall to the the synchro */ - auto* exec = execs[i]; - exec->simcalls_.push_back(simcall); - - /* see if the synchro is already finished */ - if (exec->state_ != SIMIX_WAITING && exec->state_ != SIMIX_RUNNING) { - exec->finish(); - break; - } - } -} - namespace simgrid { namespace kernel { namespace activity { -ExecImpl::~ExecImpl() +ExecImpl::ExecImpl() { - if (timeout_detector_) - timeout_detector_->unref(); - XBT_DEBUG("Destroy exec %p", this); + piface_ = new s4u::Exec(this); + actor::ActorImpl* self = actor::ActorImpl::self(); + if (self) { + actor_ = self; + self->activities_.emplace_back(this); + } } ExecImpl& ExecImpl::set_host(s4u::Host* host) { - if (not hosts_.empty()) - hosts_.clear(); - hosts_.push_back(host); + hosts_.assign(1, host); return *this; } @@ -107,8 +46,8 @@ ExecImpl& ExecImpl::set_hosts(const std::vector& hosts) ExecImpl& ExecImpl::set_timeout(double timeout) { - if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) { - timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout); + if (timeout >= 0 && not MC_is_active() && not MC_record_replay_is_active()) { + timeout_detector_.reset(hosts_.front()->pimpl_cpu->sleep(timeout)); timeout_detector_->set_activity(this); } return *this; @@ -116,9 +55,7 @@ ExecImpl& ExecImpl::set_timeout(double timeout) ExecImpl& ExecImpl::set_flops_amount(double flops_amount) { - if (not flops_amounts_.empty()) - flops_amounts_.clear(); - flops_amounts_.push_back(flops_amount); + flops_amounts_.assign(1, flops_amount); return *this; } @@ -137,17 +74,21 @@ ExecImpl& ExecImpl::set_bytes_amounts(const std::vector& bytes_amounts) ExecImpl* ExecImpl::start() { - state_ = SIMIX_RUNNING; + state_ = State::RUNNING; if (not MC_is_active() && not MC_record_replay_is_active()) { if (hosts_.size() == 1) { surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front()); surf_action_->set_sharing_penalty(sharing_penalty_); surf_action_->set_category(get_tracing_category()); - if (bound_ > 0) + if (bound_ > 0) { surf_action_->set_bound(bound_); + surf_action_->set_user_bound(bound_); + } } else { - surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1); + // FIXME[donassolo]: verify if all hosts belongs to the same netZone? + auto host_model = hosts_.front()->get_netpoint()->get_englobing_zone()->get_host_model(); + surf_action_ = host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1); } surf_action_->set_activity(this); } @@ -181,26 +122,33 @@ ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty) void ExecImpl::post() { - if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */ - /* If the host running the synchro failed, notice it. This way, the asking + xbt_assert(surf_action_ != nullptr); + if (std::any_of(hosts_.begin(), hosts_.end(), [](const s4u::Host* host) { return not host->is_on(); })) { + /* If one of the hosts running the synchro failed, notice it. This way, the asking * process can be killed if it runs on that host itself */ - state_ = SIMIX_FAILED; - } else if (surf_action_ && surf_action_->get_state() == resource::Action::State::FAILED) { - /* If the host running the synchro didn't fail, then the synchro was canceled */ - state_ = SIMIX_CANCELED; + state_ = State::FAILED; + } else if (surf_action_->get_state() == resource::Action::State::FAILED) { + /* If all the hosts are running the synchro didn't fail, then the synchro was canceled */ + state_ = State::CANCELED; } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) { - state_ = SIMIX_TIMEOUT; + if (surf_action_->get_remains() > 0.0) { + surf_action_->set_state(resource::Action::State::FAILED); + state_ = State::TIMEOUT; + } else { + state_ = State::DONE; + } } else { - state_ = SIMIX_DONE; + state_ = State::DONE; } - clean_action(); + get_iface()->set_finish_time(surf_action_->get_finish_time()); - if (timeout_detector_) { - timeout_detector_->unref(); - timeout_detector_ = nullptr; + clean_action(); + timeout_detector_.reset(); + if (actor_) { + actor_->activities_.remove(this); + actor_ = nullptr; } - /* Answer all simcalls associated with the synchro */ finish(); } @@ -215,18 +163,13 @@ void ExecImpl::finish() * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the * simcall */ - if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case - continue; // if process handling comm is killed - if (simcall->call_ == SIMCALL_EXECUTION_WAITANY_FOR) { - simgrid::kernel::activity::ExecImpl** execs = simcall_execution_waitany_for__get__execs(simcall); - size_t count = simcall_execution_waitany_for__get__count(simcall); + if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case + continue; // if process handling comm is killed + if (auto* observer = dynamic_cast(simcall->observer_)) { // simcall is a wait_any? + const auto* execs = observer->get_execs(); - for (size_t i = 0; i < count; i++) { - // Remove the first occurence of simcall: - auto* exec = execs[i]; - auto j = boost::range::find(exec->simcalls_, simcall); - if (j != exec->simcalls_.end()) - exec->simcalls_.erase(j); + for (auto* exec : *execs) { + exec->unregister_simcall(simcall); if (simcall->timeout_cb_) { simcall->timeout_cb_->remove(); @@ -235,35 +178,33 @@ void ExecImpl::finish() } if (not MC_is_active() && not MC_record_replay_is_active()) { - ExecImpl** element = std::find(execs, execs + count, this); - int rank = (element != execs + count) ? element - execs : -1; - simcall_execution_waitany_for__set__result(simcall, rank); + auto element = std::find(execs->begin(), execs->end(), this); + int rank = element != execs->end() ? static_cast(std::distance(execs->begin(), element)) : -1; + observer->set_result(rank); } } - switch (state_) { - - case SIMIX_DONE: + case State::DONE: /* do nothing, synchro done */ XBT_DEBUG("ExecImpl::finish(): execution successful"); break; - case SIMIX_FAILED: + case State::FAILED: XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer_->get_host()->get_cname()); - simcall->issuer_->context_->iwannadie = true; + simcall->issuer_->context_->set_wannadie(); 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: + case State::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: + case State::TIMEOUT: XBT_DEBUG("ExecImpl::finish(): execution timeouted"); simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted")); break; @@ -272,12 +213,12 @@ void ExecImpl::finish() xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast(state_)); } - simcall->issuer_->waiting_synchro = nullptr; + simcall->issuer_->waiting_synchro_ = nullptr; /* Fail the process if the host is down */ if (simcall->issuer_->get_host()->is_on()) simcall->issuer_->simcall_answer(); else - simcall->issuer_->context_->iwannadie = true; + simcall->issuer_->context_->set_wannadie(); } } @@ -289,9 +230,7 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to) new_action->set_remains(old_action->get_remains()); new_action->set_activity(this); new_action->set_sharing_penalty(old_action->get_sharing_penalty()); - - // FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling. - // I hope that the user did not provide any. + new_action->set_user_bound(old_action->get_user_bound()); old_action->set_activity(nullptr); old_action->cancel(); @@ -303,6 +242,33 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to) return this; } +void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector* execs, double timeout) +{ + if (timeout < 0.0) { + issuer->simcall_.timeout_cb_ = nullptr; + } else { + issuer->simcall_.timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [issuer, execs]() { + issuer->simcall_.timeout_cb_ = nullptr; + for (auto* exec : *execs) + exec->unregister_simcall(&issuer->simcall_); + // default result (-1) is set in mc::ExecutionWaitanySimcall + issuer->simcall_answer(); + }); + } + + for (auto* exec : *execs) { + /* associate this simcall to the the synchro */ + exec->simcalls_.push_back(&issuer->simcall_); + + /* see if the synchro is already finished */ + if (exec->state_ != simgrid::kernel::activity::State::WAITING && + exec->state_ != simgrid::kernel::activity::State::RUNNING) { + exec->finish(); + break; + } + } +} + /************* * Callbacks * *************/