X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97bf7e40f9386d7a55438ba5bf21829b289453ef..2f2db04b850386899392bc06568f17f071f8620f:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 06440b4d47..3a87ef27dd 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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/simix.hpp" #include #include #include @@ -14,22 +15,15 @@ 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::complete(Activity::State state) -{ - Activity::complete(state); - on_completion(*this); -} -void Exec::reset() +void Exec::reset() const { boost::static_pointer_cast(pimpl_)->reset(); } @@ -37,20 +31,12 @@ void Exec::reset() ExecPtr Exec::init() { auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); - unsigned int cb_id = Host::on_state_change.connect([pimpl](s4u::Host const& h) { - if (not h.is_on() && pimpl->state_ == kernel::activity::State::RUNNING && - std::find(pimpl->get_hosts().begin(), pimpl->get_hosts().end(), &h) != pimpl->get_hosts().end()) { - pimpl->state_ = kernel::activity::State::FAILED; - pimpl->post(); - } - }); - pimpl->set_cb_id(cb_id); - return ExecPtr(pimpl->get_iface()); + return ExecPtr(static_cast(pimpl->get_iface())); } -Exec* Exec::start() +Exec* Exec::do_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()) @@ -67,20 +53,10 @@ Exec* Exec::start() ssize_t Exec::wait_any_for(const 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}; - ssize_t 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) - execs.at(changed_pos)->complete(State::FINISHED); - return changed_pos; + 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 @@ -91,8 +67,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; } @@ -106,7 +83,7 @@ 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; @@ -114,7 +91,7 @@ ExecPtr Exec::set_priority(double priority) ExecPtr Exec::update_priority(double priority) { - kernel::actor::simcall([this, priority] { + kernel::actor::simcall_answered([this, priority] { boost::static_pointer_cast(pimpl_)->update_sharing_penalty(1. / priority); }); return this; @@ -124,10 +101,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; } @@ -135,7 +112,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; @@ -146,13 +123,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. */ @@ -165,14 +152,9 @@ unsigned int Exec::get_host_number() const return static_cast(pimpl_.get())->get_host_number(); } -double Exec::get_start_time() const -{ - return static_cast(pimpl_.get())->get_start_time(); -} - -double Exec::get_finish_time() const +int Exec::get_thread_count() const { - return static_cast(pimpl_.get())->get_finish_time(); + return static_cast(pimpl_.get())->get_thread_count(); } /** @brief Change the host on which this activity takes place. @@ -186,12 +168,12 @@ ExecPtr Exec::set_host(Host* host) 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 - vetoable_start(); + // Setting the host may allow to start the activity, let's try + start(); return this; } @@ -201,13 +183,14 @@ 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: %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 if (state_ == State::STARTING) - vetoable_start(); + start(); return this; } @@ -222,7 +205,7 @@ ExecPtr Exec::unset_host() if (state_ == State::STARTED) cancel(); - vetoable_start(); + start(); return this; } @@ -230,7 +213,7 @@ ExecPtr Exec::unset_host() double Exec::get_cost() const { - return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost(); + return (pimpl_->model_action_ == nullptr) ? -1 : pimpl_->model_action_->get_cost(); } double Exec::get_remaining() const @@ -239,7 +222,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(); }); } @@ -250,10 +233,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(); }); } @@ -261,8 +244,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) @@ -297,7 +279,7 @@ double sg_exec_get_remaining_ratio(const_sg_exec_t exec) void sg_exec_start(sg_exec_t exec) { - exec->vetoable_start(); + exec->start(); } void sg_exec_cancel(sg_exec_t exec)