X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8afbb17eb3f78b92d2c417476e5c096bbfca69ac..c8b2d9c4bfee6171c649d2fdbfa96a742a478778:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 214676d4aa..4e3f3f23ef 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -3,22 +3,19 @@ /* 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/mc/checker/SimcallObserver.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" -#include - -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_actor); namespace simgrid { namespace kernel { @@ -49,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; @@ -79,20 +76,16 @@ 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); } surf_action_->set_activity(this); + start_time_ = surf_action_->get_start_time(); } XBT_DEBUG("Create execute synchro %p: %s", this, get_cname()); @@ -122,6 +115,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); @@ -143,7 +143,7 @@ void ExecImpl::post() state_ = State::DONE; } - get_iface()->set_finish_time(surf_action_->get_finish_time()); + finish_time_ = surf_action_->get_finish_time(); clean_action(); timeout_detector_.reset(); @@ -151,72 +151,69 @@ void ExecImpl::post() actor_->activities_.remove(this); actor_ = nullptr; } + 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: + piface_->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_)); while (not simcalls_.empty()) { 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 (auto* observer = dynamic_cast(simcall->observer_)) { - if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case - continue; // if process handling comm is killed - if (const auto* observer = dynamic_cast(simcall->observer_)) { - const auto* execs = observer->get_execs(); - - for (auto* exec : *execs) { - // Remove the first occurrence of simcall: - auto j = boost::range::find(exec->simcalls_, simcall); - if (j != exec->simcalls_.end()) - exec->simcalls_.erase(j); - - if (simcall->timeout_cb_) { - simcall->timeout_cb_->remove(); - simcall->timeout_cb_ = nullptr; - } + const auto& execs = observer->get_execs(); + + for (auto* exec : execs) + exec->unregister_simcall(simcall); + + if (simcall->timeout_cb_) { + simcall->timeout_cb_->remove(); + simcall->timeout_cb_ = nullptr; } if (not MC_is_active() && not MC_record_replay_is_active()) { - auto element = std::find(execs->begin(), execs->end(), this); - int rank = element != execs->end() ? static_cast(std::distance(execs->begin(), element)) : -1; - simix::marshal(simcall->result_, 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 State::DONE: - /* do nothing, synchro done */ - XBT_DEBUG("ExecImpl::finish(): execution successful"); - break; - - case State::FAILED: - XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer_->get_host()->get_cname()); - 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 State::CANCELED: - XBT_DEBUG("ExecImpl::finish(): execution canceled"); - simcall->issuer_->exception_ = - std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled")); - break; - - case State::TIMEOUT: - XBT_DEBUG("ExecImpl::finish(): execution timeouted"); - simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted")); - break; - - default: - xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast(state_)); - } + + set_exception(simcall->issuer_); simcall->issuer_->waiting_synchro_ = nullptr; /* Fail the process if the host is down */ @@ -231,7 +228,7 @@ 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()); @@ -247,31 +244,25 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to) return this; } -void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector* execs, double timeout) +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_ = timer::Timer::set(s4u::Engine::get_clock() + timeout, [issuer, &execs]() { issuer->simcall_.timeout_cb_ = nullptr; - for (auto* exec : *execs) { - // Remove the first occurrence of simcall: - auto j = boost::range::find(exec->simcalls_, &issuer->simcall_); - if (j != exec->simcalls_.end()) - exec->simcalls_.erase(j); - } - simix::marshal(issuer->simcall_.result_, -1); + for (auto* exec : execs) + exec->unregister_simcall(&issuer->simcall_); + // default result (-1) is set in actor::ExecutionWaitanySimcall issuer->simcall_answer(); }); } - for (auto* exec : *execs) { + 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) { + if (exec->state_ != State::WAITING && exec->state_ != State::RUNNING) { exec->finish(); break; }