X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b4662416289a826b9dcd961b4721172c3884cd1..7672ae43c2b49a7dcdc0976cc89a05cc87ae534c:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 0affcec6c6..24946989ec 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -1,38 +1,50 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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 "simgrid/Exception.hpp" -#include "simgrid/exec.h" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Exec.hpp" +#include "simgrid/simix.hpp" +#include +#include +#include +#include + #include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_exec, s4u_activity, "S4U asynchronous executions"); -namespace simgrid { -namespace s4u { +namespace simgrid::s4u { xbt::signal Exec::on_start; -xbt::signal Exec::on_completion; Exec::Exec(kernel::activity::ExecImplPtr pimpl) { pimpl_ = pimpl; } +void Exec::reset() const +{ + boost::static_pointer_cast(pimpl_)->reset(); +} + ExecPtr Exec::init() { auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); - return ExecPtr(pimpl->get_iface()); + unsigned int cb_id = Host::on_state_change.connect([pimpl](s4u::Host const& h) { + if (not h.is_on() && pimpl->get_state() == kernel::activity::State::RUNNING && + std::find(pimpl->get_hosts().begin(), pimpl->get_hosts().end(), &h) != pimpl->get_hosts().end()) { + pimpl->set_state(kernel::activity::State::FAILED); + pimpl->post(); + } + }); + pimpl->set_cb_id(cb_id); + return ExecPtr(static_cast(pimpl->get_iface())); } Exec* Exec::start() { - kernel::actor::simcall([this] { + kernel::actor::simcall_answered([this] { (*boost::static_pointer_cast(pimpl_)) .set_name(get_name()) .set_tracing_category(get_tracing_category()) @@ -43,55 +55,16 @@ Exec* Exec::start() pimpl_->suspend(); state_ = State::STARTED; - start_time_ = pimpl_->surf_action_->get_start_time(); on_start(*this); return this; } -Exec* Exec::wait() -{ - return this->wait_for(-1); -} - -Exec* Exec::wait_for(double timeout) +ssize_t Exec::wait_any_for(const std::vector& execs, double timeout) { - if (state_ == State::INITED) - vetoable_start(); - - kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::simcall_blocking([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); }); - state_ = State::FINISHED; - on_completion(*this); - this->release_dependencies(); - return this; -} - -int Exec::wait_any_for(std::vector* execs, double timeout) -{ - std::vector rexecs(execs->size()); - std::transform(begin(*execs), end(*execs), begin(rexecs), - [](const ExecPtr& exec) { return static_cast(exec->pimpl_.get()); }); - - kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::ExecutionWaitanySimcall observer{issuer, &rexecs, timeout}; - int changed_pos = kernel::actor::simcall_blocking( - [&observer] { - kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(), observer.get_timeout()); - }, - &observer); - if (changed_pos != -1) { - on_completion(*(execs->at(changed_pos))); - execs->at(changed_pos)->release_dependencies(); - } - return changed_pos; -} - -Exec* Exec::cancel() -{ - kernel::actor::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); - state_ = State::CANCELED; - on_completion(*this); - return this; + std::vector activities; + for (const auto& exec : execs) + activities.push_back(boost::dynamic_pointer_cast(exec)); + return Activity::wait_any_for(activities, timeout); } /** @brief change the execution bound @@ -102,8 +75,9 @@ ExecPtr Exec::set_bound(double bound) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the bound of an exec after its start"); - kernel::actor::simcall( - [this, bound] { boost::static_pointer_cast(pimpl_)->set_bound(bound); }); + kernel::actor::simcall_object_access(pimpl_.get(), [this, bound] { + boost::static_pointer_cast(pimpl_)->set_bound(bound); + }); return this; } @@ -117,18 +91,17 @@ ExecPtr Exec::set_priority(double priority) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the priority of an exec after its start"); - kernel::actor::simcall([this, priority] { + kernel::actor::simcall_object_access(pimpl_.get(), [this, priority] { boost::static_pointer_cast(pimpl_)->set_sharing_penalty(1. / priority); }); return this; } -ExecPtr Exec::set_timeout(double timeout) // XBT_ATTRIB_DEPRECATED_v329 +ExecPtr Exec::update_priority(double priority) { - xbt_assert(state_ == State::INITED || state_ == State::STARTING, - "Cannot change the bound of an exec after its start"); - kernel::actor::simcall( - [this, timeout] { boost::static_pointer_cast(pimpl_)->set_timeout(timeout); }); + kernel::actor::simcall_answered([this, priority] { + boost::static_pointer_cast(pimpl_)->update_sharing_penalty(1. / priority); + }); return this; } @@ -136,10 +109,10 @@ ExecPtr Exec::set_flops_amount(double flops_amount) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the flop_amount of an exec after its start"); - kernel::actor::simcall([this, flops_amount] { + kernel::actor::simcall_object_access(pimpl_.get(), [this, flops_amount] { boost::static_pointer_cast(pimpl_)->set_flops_amount(flops_amount); }); - Activity::set_remaining(flops_amount); + set_remaining(flops_amount); return this; } @@ -147,7 +120,7 @@ ExecPtr Exec::set_flops_amounts(const std::vector& flops_amounts) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the flops_amounts of an exec after its start"); - kernel::actor::simcall([this, flops_amounts] { + kernel::actor::simcall_object_access(pimpl_.get(), [this, flops_amounts] { boost::static_pointer_cast(pimpl_)->set_flops_amounts(flops_amounts); }); parallel_ = true; @@ -158,13 +131,23 @@ ExecPtr Exec::set_bytes_amounts(const std::vector& bytes_amounts) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the bytes_amounts of an exec after its start"); - kernel::actor::simcall([this, bytes_amounts] { + kernel::actor::simcall_object_access(pimpl_.get(), [this, bytes_amounts] { boost::static_pointer_cast(pimpl_)->set_bytes_amounts(bytes_amounts); }); parallel_ = true; return this; } +ExecPtr Exec::set_thread_count(int thread_count) +{ + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the bytes_amounts of an exec after its start"); + kernel::actor::simcall_object_access(pimpl_.get(), [this, thread_count] { + boost::static_pointer_cast(pimpl_)->set_thread_count(thread_count); + }); + return this; +} + /** @brief Retrieve the host on which this activity takes place. * If it runs on more than one host, only the first host is returned. */ @@ -177,19 +160,24 @@ unsigned int Exec::get_host_number() const return static_cast(pimpl_.get())->get_host_number(); } +int Exec::get_thread_count() const +{ + return static_cast(pimpl_.get())->get_thread_count(); +} + /** @brief Change the host on which this activity takes place. * * The activity cannot be terminated already (but it may be started). */ ExecPtr Exec::set_host(Host* host) { xbt_assert(state_ == State::INITED || state_ == State::STARTING || state_ == State::STARTED, - "Cannot change the host of an exec once it's done (state: %d)", (int)state_); + "Cannot change the host of an exec once it's done (state: %s)", to_c_str(state_)); if (state_ == State::STARTED) boost::static_pointer_cast(pimpl_)->migrate(host); - kernel::actor::simcall( - [this, host] { boost::static_pointer_cast(pimpl_)->set_host(host); }); + kernel::actor::simcall_object_access( + pimpl_.get(), [this, host] { boost::static_pointer_cast(pimpl_)->set_host(host); }); if (state_ == State::STARTING) // Setting the host may allow to start the activity, let's try @@ -201,10 +189,11 @@ ExecPtr Exec::set_host(Host* host) ExecPtr Exec::set_hosts(const std::vector& hosts) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, - "Cannot change the hosts of an exec once it's done (state: %d)", (int)state_); + "Cannot change the hosts of an exec once it's done (state: %s)", to_c_str(state_)); - kernel::actor::simcall( - [this, hosts] { boost::static_pointer_cast(pimpl_)->set_hosts(hosts); }); + kernel::actor::simcall_object_access(pimpl_.get(), [this, hosts] { + boost::static_pointer_cast(pimpl_)->set_hosts(hosts); + }); parallel_ = true; // Setting the host may allow to start the activity, let's try @@ -214,6 +203,22 @@ ExecPtr Exec::set_hosts(const std::vector& hosts) return this; } +ExecPtr Exec::unset_host() +{ + if (not is_assigned()) + throw std::invalid_argument( + xbt::string_printf("Exec %s: the activity is not assigned to any host(s)", get_cname())); + else { + reset(); + + if (state_ == State::STARTED) + cancel(); + vetoable_start(); + + return this; + } +} + double Exec::get_cost() const { return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost(); @@ -225,7 +230,7 @@ double Exec::get_remaining() const XBT_WARN("Calling get_remaining() on a parallel execution is not allowed. Call get_remaining_ratio() instead."); return get_remaining_ratio(); } else - return kernel::actor::simcall( + return kernel::actor::simcall_answered( [this]() { return boost::static_pointer_cast(pimpl_)->get_remaining(); }); } @@ -236,10 +241,10 @@ double Exec::get_remaining() const double Exec::get_remaining_ratio() const { if (is_parallel()) - return kernel::actor::simcall( + return kernel::actor::simcall_answered( [this]() { return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); }); else - return kernel::actor::simcall( + return kernel::actor::simcall_answered( [this]() { return boost::static_pointer_cast(pimpl_)->get_seq_remaining_ratio(); }); } @@ -247,8 +252,7 @@ bool Exec::is_assigned() const { return not boost::static_pointer_cast(pimpl_)->get_hosts().empty(); } -} // namespace s4u -} // namespace simgrid +} // namespace simgrid::s4u /* **************************** Public C interface *************************** */ void sg_exec_set_bound(sg_exec_t exec, double bound) @@ -302,19 +306,7 @@ int sg_exec_test(sg_exec_t exec) sg_error_t sg_exec_wait(sg_exec_t exec) { - sg_error_t status = SG_OK; - - simgrid::s4u::ExecPtr s4u_exec(exec, false); - try { - s4u_exec->wait_for(-1); - } catch (const simgrid::TimeoutException&) { - status = SG_ERROR_TIMEOUT; - } catch (const simgrid::CancelException&) { - status = SG_ERROR_CANCELED; - } catch (const simgrid::HostFailureException&) { - status = SG_ERROR_HOST; - } - return status; + return sg_exec_wait_for(exec, -1.0); } sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout) @@ -325,6 +317,7 @@ sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout) try { s4u_exec->wait_for(timeout); } catch (const simgrid::TimeoutException&) { + s4u_exec->add_ref(); // the wait_for timeouted, keep the exec alive status = SG_ERROR_TIMEOUT; } catch (const simgrid::CancelException&) { status = SG_ERROR_CANCELED; @@ -334,20 +327,20 @@ sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout) return status; } -int sg_exec_wait_any(sg_exec_t* execs, size_t count) +ssize_t sg_exec_wait_any(sg_exec_t* execs, size_t count) { - return sg_exec_wait_any_for(execs, count, -1); + return sg_exec_wait_any_for(execs, count, -1.0); } -int sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout) +ssize_t sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout) { std::vector s4u_execs; - for (unsigned int i = 0; i < count; i++) + for (size_t i = 0; i < count; i++) s4u_execs.emplace_back(execs[i], false); - int pos = simgrid::s4u::Exec::wait_any_for(&s4u_execs, timeout); - for (unsigned i = 0; i < count; i++) { - if (pos != -1 && static_cast(pos) != i) + ssize_t pos = simgrid::s4u::Exec::wait_any_for(s4u_execs, timeout); + for (size_t i = 0; i < count; i++) { + if (pos != -1 && static_cast(pos) != i) s4u_execs[i]->add_ref(); } return pos;