X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..59eb941343a62f9f72f7fb787837a179cdfadf1d:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 259ed33b3b..3a87ef27dd 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2006-2022. 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 @@ -30,18 +31,10 @@ void Exec::reset() const 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->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() +Exec* Exec::do_start() { kernel::actor::simcall_answered([this] { (*boost::static_pointer_cast(pimpl_)) @@ -74,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_answered( - [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; } @@ -89,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_answered([this, priority] { + kernel::actor::simcall_object_access(pimpl_.get(), [this, priority] { boost::static_pointer_cast(pimpl_)->set_sharing_penalty(1. / priority); }); return this; @@ -107,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_answered([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; } @@ -118,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_answered([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; @@ -129,7 +123,7 @@ 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_answered([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; @@ -140,7 +134,7 @@ 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_answered([this, thread_count] { + kernel::actor::simcall_object_access(pimpl_.get(), [this, thread_count] { boost::static_pointer_cast(pimpl_)->set_thread_count(thread_count); }); return this; @@ -158,6 +152,11 @@ 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). */ @@ -169,12 +168,12 @@ ExecPtr Exec::set_host(Host* host) if (state_ == State::STARTED) boost::static_pointer_cast(pimpl_)->migrate(host); - kernel::actor::simcall_answered( - [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; } @@ -184,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_answered( - [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; } @@ -205,7 +205,7 @@ ExecPtr Exec::unset_host() if (state_ == State::STARTED) cancel(); - vetoable_start(); + start(); return this; } @@ -213,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 @@ -279,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)