X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d6ee66c4a278f168be501318e781c0853085bdc..cf6a1d5f1eddea2b377415ab57c5185058488269:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index bc50765496..24e0111c3a 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -8,6 +8,8 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" #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"); @@ -17,31 +19,37 @@ namespace s4u { xbt::signal Exec::on_start; xbt::signal Exec::on_completion; -Exec::Exec() +Exec::Exec(kernel::activity::ExecImplPtr pimpl) { - pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); + pimpl_ = pimpl; } -ExecPtr Exec::init() +void Exec::complete(Activity::State state) { - return ExecPtr(new Exec()); + Activity::complete(state); + on_completion(*this); } -Exec* Exec::wait() +ExecPtr Exec::init() { - return this->wait_for(-1); + auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); + return ExecPtr(pimpl->get_iface()); } -Exec* Exec::wait_for(double timeout) +Exec* Exec::start() { - if (state_ == State::INITED) - vetoable_start(); + kernel::actor::simcall([this] { + (*boost::static_pointer_cast(pimpl_)) + .set_name(get_name()) + .set_tracing_category(get_tracing_category()) + .start(); + }); - kernel::actor::ActorImpl* issuer = Actor::self()->get_impl(); - kernel::actor::simcall_blocking([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); }); - state_ = State::FINISHED; - on_completion(*this); - this->release_dependencies(); + if (suspended_) + pimpl_->suspend(); + + state_ = State::STARTED; + on_start(*this); return this; } @@ -51,56 +59,85 @@ int Exec::wait_any_for(std::vector* execs, double timeout) std::transform(begin(*execs), end(*execs), begin(rexecs), [](const ExecPtr& exec) { return static_cast(exec->pimpl_.get()); }); - int changed_pos = simcall_execution_waitany_for(rexecs.data(), rexecs.size(), timeout); + 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) - execs->at(changed_pos)->release_dependencies(); + execs->at(changed_pos)->complete(State::FINISHED); return changed_pos; } -Exec* Exec::cancel() -{ - kernel::actor::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); - state_ = State::CANCELED; - return this; -} - /** @brief change the execution bound * This means changing the maximal amount of flops per second that it may consume, regardless of what the host may * deliver. Currently, this cannot be changed once the exec started. */ ExecPtr Exec::set_bound(double bound) { - xbt_assert(state_ == State::INITED, "Cannot change the bound of an exec after its start"); - bound_ = 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); }); + return this; +} + +/** @brief Change the execution priority, don't you think? + * + * An execution with twice the priority will get twice the amount of flops when the resource is shared. + * The default priority is 1. + * + * Currently, this cannot be changed once the exec started. */ +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] { + boost::static_pointer_cast(pimpl_)->set_sharing_penalty(1. / priority); + }); return this; } + ExecPtr Exec::set_timeout(double timeout) // XBT_ATTRIB_DEPRECATED_v329 { - xbt_assert(state_ == State::INITED, "Cannot change the bound of an exec after its start"); - timeout_ = timeout; + 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); }); return this; } ExecPtr Exec::set_flops_amount(double flops_amount) { - xbt_assert(state_ == State::INITED, "Cannot change the flop_amount of an exec after its start"); - flops_amounts_.assign(1, flops_amount); - Activity::set_remaining(flops_amounts_.front()); + 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] { + boost::static_pointer_cast(pimpl_)->set_flops_amount(flops_amount); + }); + Activity::set_remaining(flops_amount); return this; } ExecPtr Exec::set_flops_amounts(const std::vector& flops_amounts) { - xbt_assert(state_ == State::INITED, "Cannot change the flops_amounts of an exec after its start"); - flops_amounts_ = 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] { + boost::static_pointer_cast(pimpl_)->set_flops_amounts(flops_amounts); + }); parallel_ = true; return this; } ExecPtr Exec::set_bytes_amounts(const std::vector& bytes_amounts) { - xbt_assert(state_ == State::INITED, "Cannot change the bytes_amounts of an exec after its start"); - bytes_amounts_ = 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] { + boost::static_pointer_cast(pimpl_)->set_bytes_amounts(bytes_amounts); + }); parallel_ = true; return this; } @@ -116,30 +153,15 @@ unsigned int Exec::get_host_number() const { return static_cast(pimpl_.get())->get_host_number(); } + double Exec::get_start_time() const { - return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_start_time(); -} -double Exec::get_finish_time() const -{ - return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_finish_time(); -} -double Exec::get_cost() const -{ - return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost(); + return static_cast(pimpl_.get())->get_start_time(); } -/** @brief Change the execution priority, don't you think? - * - * An execution with twice the priority will get twice the amount of flops when the resource is shared. - * The default priority is 1. - * - * Currently, this cannot be changed once the exec started. */ -ExecPtr Exec::set_priority(double priority) +double Exec::get_finish_time() const { - xbt_assert(state_ == State::INITED, "Cannot change the priority of an exec after its start"); - priority_ = priority; - return this; + return static_cast(pimpl_.get())->get_finish_time(); } /** @brief Change the host on which this activity takes place. @@ -148,13 +170,13 @@ ExecPtr Exec::set_priority(double priority) 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_); - hosts_.assign(1, host); + "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); - boost::static_pointer_cast(pimpl_)->set_host(host); + kernel::actor::simcall( + [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 @@ -166,9 +188,10 @@ 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_)); - hosts_ = hosts; + kernel::actor::simcall( + [this, hosts] { boost::static_pointer_cast(pimpl_)->set_hosts(hosts); }); parallel_ = true; // Setting the host may allow to start the activity, let's try @@ -178,35 +201,9 @@ ExecPtr Exec::set_hosts(const std::vector& hosts) return this; } -///////////// SEQUENTIAL EXECUTIONS //////// -Exec* Exec::start() +double Exec::get_cost() const { - if (is_parallel()) - kernel::actor::simcall([this] { - (*boost::static_pointer_cast(pimpl_)) - .set_hosts(hosts_) - .set_timeout(timeout_) - .set_flops_amounts(flops_amounts_) - .set_bytes_amounts(bytes_amounts_) - .start(); - }); - else - kernel::actor::simcall([this] { - (*boost::static_pointer_cast(pimpl_)) - .set_name(get_name()) - .set_tracing_category(get_tracing_category()) - .set_sharing_penalty(1. / priority_) - .set_bound(bound_) - .set_flops_amount(flops_amounts_.front()) - .start(); - }); - - if (suspended_) - pimpl_->suspend(); - - state_ = State::STARTED; - on_start(*this); - return this; + return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost(); } double Exec::get_remaining() const @@ -233,8 +230,13 @@ double Exec::get_remaining_ratio() const [this]() { return boost::static_pointer_cast(pimpl_)->get_seq_remaining_ratio(); }); } +bool Exec::is_assigned() const +{ + return not boost::static_pointer_cast(pimpl_)->get_hosts().empty(); +} } // namespace s4u } // namespace simgrid + /* **************************** Public C interface *************************** */ void sg_exec_set_bound(sg_exec_t exec, double bound) { @@ -268,7 +270,7 @@ double sg_exec_get_remaining_ratio(const_sg_exec_t exec) void sg_exec_start(sg_exec_t exec) { - exec->start(); + exec->vetoable_start(); } void sg_exec_cancel(sg_exec_t exec) @@ -287,19 +289,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) @@ -310,6 +300,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; @@ -321,7 +312,7 @@ sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout) int 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)