X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76081077f259960acb8a8624359ad2aa5c32ab46..0c586d7f087b772253980cafd92796edcbd58c50:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index c1d2583cce..d1d016776b 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -1,22 +1,21 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2022. 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 +#include +#include +#include + #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/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" +#include "src/kernel/resource/CpuImpl.hpp" #include "src/mc/mc_replay.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); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor); namespace simgrid { namespace kernel { @@ -27,7 +26,7 @@ ExecImpl::ExecImpl() piface_ = new s4u::Exec(this); actor::ActorImpl* self = actor::ActorImpl::self(); if (self) { - actor_ = self; + set_actor(self); self->activities_.emplace_back(this); } } @@ -47,7 +46,7 @@ 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_.reset(hosts_.front()->pimpl_cpu->sleep(timeout)); + timeout_detector_.reset(hosts_.front()->get_cpu()->sleep(timeout)); timeout_detector_->set_activity(this); } return *this; @@ -77,16 +76,11 @@ ExecImpl* ExecImpl::start() 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_ = hosts_.front()->get_cpu()->execution_start(flops_amounts_.front(), bound_); surf_action_->set_sharing_penalty(sharing_penalty_); surf_action_->set_category(get_tracing_category()); - - if (bound_ > 0) { - surf_action_->set_bound(bound_); - surf_action_->set_user_bound(bound_); - } } else { - // FIXME[donassolo]: verify if all hosts belongs to the same netZone? + // get the model from first host since we have only 1 by now 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); } @@ -98,14 +92,25 @@ ExecImpl* ExecImpl::start() return this; } +double ExecImpl::get_remaining() const +{ + if (state_ == State::WAITING || state_ == State::FAILED) + return flops_amounts_.front(); + return ActivityImpl::get_remaining(); +} + double ExecImpl::get_seq_remaining_ratio() { + if (state_ == State::WAITING) + return 1; 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 + if (state_ == State::WAITING) + return 1; return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains(); } @@ -121,6 +126,13 @@ ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty) return *this; } +ExecImpl& ExecImpl::update_sharing_penalty(double sharing_penalty) +{ + sharing_penalty_ = sharing_penalty; + surf_action_->set_sharing_penalty(sharing_penalty); + return *this; +} + void ExecImpl::post() { xbt_assert(surf_action_ != nullptr); @@ -142,18 +154,41 @@ void ExecImpl::post() state_ = State::DONE; } - finish_time_ = surf_action_->get_finish_time(); - clean_action(); timeout_detector_.reset(); - if (actor_) { - actor_->activities_.remove(this); - actor_ = nullptr; + if (get_actor() != nullptr) { + get_actor()->activities_.remove(this); } + if (state_ != State::FAILED && cb_id_ >= 0) + s4u::Host::on_state_change.disconnect(cb_id_); /* Answer all simcalls associated with the synchro */ finish(); } +void ExecImpl::set_exception(actor::ActorImpl* issuer) +{ + switch (state_) { + case State::FAILED: + static_cast(get_iface())->complete(s4u::Activity::State::FAILED); + if (issuer->get_host()->is_on()) + issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed")); + else /* else, the actor will be killed with no possibility to survive */ + issuer->context_->set_wannadie(); + break; + + case State::CANCELED: + issuer->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Execution Canceled")); + break; + + case State::TIMEOUT: + issuer->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted")); + break; + + default: + xbt_assert(state_ == State::DONE, "Internal error in ExecImpl::finish(): unexpected synchro state %s", + to_c_str(state_)); + } +} void ExecImpl::finish() { XBT_DEBUG("ExecImpl::finish() in state %s", to_c_str(state_)); @@ -161,23 +196,21 @@ void ExecImpl::finish() smx_simcall_t simcall = simcalls_.front(); simcalls_.pop_front(); + if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case + continue; // if process handling comm is killed + /* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany * 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_ == 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? + if (auto* observer = dynamic_cast(simcall->observer_)) { const auto& execs = observer->get_execs(); - for (auto* exec : execs) { + for (auto* exec : execs) exec->unregister_simcall(simcall); - if (simcall->timeout_cb_) { - simcall->timeout_cb_->remove(); - simcall->timeout_cb_ = nullptr; - } + if (simcall->timeout_cb_) { + simcall->timeout_cb_->remove(); + simcall->timeout_cb_ = nullptr; } if (not MC_is_active() && not MC_record_replay_is_active()) { @@ -186,26 +219,8 @@ void ExecImpl::finish() observer->set_result(rank); } } - switch (state_) { - case State::FAILED: - simcall->issuer_->context_->set_wannadie(); - if (simcall->issuer_->get_host()->is_on()) - simcall->issuer_->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed")); - /* else, the actor will be killed with no possibility to survive */ - break; - - case State::CANCELED: - simcall->issuer_->exception_ = std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Execution Canceled")); - break; - - case State::TIMEOUT: - simcall->issuer_->exception_ = std::make_exception_ptr(TimeoutException(XBT_THROW_POINT, "Timeouted")); - break; - - default: - xbt_assert(state_ == State::DONE, "Internal error in ExecImpl::finish(): unexpected synchro state %s", - to_c_str(state_)); - } + + set_exception(simcall->issuer_); simcall->issuer_->waiting_synchro_ = nullptr; /* Fail the process if the host is down */ @@ -216,11 +231,19 @@ void ExecImpl::finish() } } +void ExecImpl::reset() +{ + hosts_.clear(); + bytes_amounts_.clear(); + flops_amounts_.clear(); + start_time_ = -1.0; +} + ActivityImpl* ExecImpl::migrate(s4u::Host* to) { if (not MC_is_active() && not MC_record_replay_is_active()) { resource::Action* old_action = this->surf_action_; - resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost()); + resource::Action* new_action = to->get_cpu()->execution_start(old_action->get_cost(), old_action->get_user_bound()); new_action->set_remains(old_action->get_remains()); new_action->set_activity(this); new_action->set_sharing_penalty(old_action->get_sharing_penalty()); @@ -241,7 +264,7 @@ void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vectorsimcall_.timeout_cb_ = nullptr; } else { - issuer->simcall_.timeout_cb_ = timer::Timer::set(SIMIX_get_clock() + timeout, [issuer, &execs]() { + issuer->simcall_.timeout_cb_ = timer::Timer::set(s4u::Engine::get_clock() + timeout, [issuer, &execs]() { issuer->simcall_.timeout_cb_ = nullptr; for (auto* exec : execs) exec->unregister_simcall(&issuer->simcall_); @@ -253,7 +276,6 @@ void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vectorsimcalls_.push_back(&issuer->simcall_); - /* see if the synchro is already finished */ if (exec->state_ != State::WAITING && exec->state_ != State::RUNNING) { exec->finish();