X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/554255fe3f311a54df171d31a4a27f4004840f59..4542c9b5320d863afc041a1d9eada0f27e133086:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 51c7408a6a..2ae3ad2f2d 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -24,27 +24,33 @@ Exec::Exec(kernel::activity::ExecImplPtr pimpl) pimpl_ = pimpl; } +void Exec::complete(Activity::State state) +{ + Activity::complete(state); + on_completion(*this); +} + ExecPtr Exec::init() { auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); return ExecPtr(pimpl->get_iface()); } -Exec* Exec::wait() +Exec* Exec::start() { - return this->wait_for(-1); -} + kernel::actor::simcall([this] { + (*boost::static_pointer_cast(pimpl_)) + .set_name(get_name()) + .set_tracing_category(get_tracing_category()) + .start(); + }); -Exec* Exec::wait_for(double timeout) -{ - if (state_ == State::INITED) - vetoable_start(); + if (suspended_) + pimpl_->suspend(); - 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(); + state_ = State::STARTED; + start_time_ = pimpl_->surf_action_->get_start_time(); + on_start(*this); return this; } @@ -55,27 +61,17 @@ int Exec::wait_any_for(std::vector* execs, double timeout) [](const ExecPtr& exec) { return static_cast(exec->pimpl_.get()); }); kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::ExecutionWaitanySimcall observer{issuer, &rexecs, timeout}; + 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(); - } + if (changed_pos != -1) + 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; - on_completion(*this); - 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. @@ -83,15 +79,34 @@ Exec* Exec::cancel() ExecPtr Exec::set_bound(double bound) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, - "Cannot change the bound of an exec after its start"); - bound_ = bound; + "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|| state_ == State::STARTING, - "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; } @@ -99,8 +114,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"); - flops_amounts_.assign(1, flops_amount); - Activity::set_remaining(flops_amounts_.front()); + kernel::actor::simcall([this, flops_amount] { + boost::static_pointer_cast(pimpl_)->set_flops_amount(flops_amount); + }); + Activity::set_remaining(flops_amount); return this; } @@ -108,7 +125,9 @@ 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"); - flops_amounts_ = flops_amounts; + kernel::actor::simcall([this, flops_amounts] { + boost::static_pointer_cast(pimpl_)->set_flops_amounts(flops_amounts); + }); parallel_ = true; return this; } @@ -117,7 +136,9 @@ 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"); - bytes_amounts_ = bytes_amounts; + kernel::actor::simcall([this, bytes_amounts] { + boost::static_pointer_cast(pimpl_)->set_bytes_amounts(bytes_amounts); + }); parallel_ = true; return this; } @@ -133,23 +154,6 @@ unsigned int Exec::get_host_number() const { return static_cast(pimpl_.get())->get_host_number(); } -double Exec::get_cost() const -{ - return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost(); -} - -/** @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, "Cannot change the priority of an exec after its start"); - priority_ = priority; - return this; -} /** @brief Change the host on which this activity takes place. * @@ -157,13 +161,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 @@ -175,9 +179,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 @@ -187,35 +192,9 @@ ExecPtr Exec::set_hosts(const std::vector& hosts) return this; } -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; - start_time_ = pimpl_->surf_action_->get_start_time(); - on_start(*this); - return this; + return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost(); } double Exec::get_remaining() const @@ -242,6 +221,10 @@ 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