X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fc309f0124ca91be813d84d9c4f597162f07a05..ce930ad96b622e2b3856b7d9c3d97e60ec2c93a1:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 27ff9fd985..7684d9cf78 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -12,12 +12,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_exec, s4u_activity, "S4U asynchronous execut namespace simgrid { namespace s4u { -xbt::signal Exec::on_start; -xbt::signal Exec::on_completion; +xbt::signal Exec::on_start; +xbt::signal Exec::on_completion; Exec::Exec() { - pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl(get_name(), get_tracing_category())); + pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); } bool Exec::test() @@ -44,7 +44,7 @@ Exec* Exec::wait() start(); simcall_execution_wait(pimpl_); state_ = State::FINISHED; - on_completion(Actor::self()); + on_completion(*Actor::self(), *this); return this; } @@ -53,9 +53,17 @@ Exec* Exec::wait_for(double) THROW_UNIMPLEMENTED; } +int Exec::wait_any_for(std::vector* execs, double timeout) +{ + std::unique_ptr rexecs(new kernel::activity::ExecImpl*[execs->size()]); + std::transform(begin(*execs), end(*execs), rexecs.get(), + [](const ExecPtr& exec) { return static_cast(exec->pimpl_.get()); }); + return simcall_execution_waitany_for(rexecs.get(), execs->size(), timeout); +} + Exec* Exec::cancel() { - simix::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); + kernel::actor::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); state_ = State::CANCELED; return this; } @@ -90,6 +98,37 @@ ExecPtr Exec::set_timeout(double timeout) return this; } +ExecPtr Exec::set_name(const std::string& name) +{ + xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start"); + name_ = name; + 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. + */ +Host* Exec::get_host() const +{ + return static_cast(pimpl_.get())->get_host(); +} +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(); +} + /** @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. @@ -112,11 +151,17 @@ ExecSeq::ExecSeq(sg_host_t host, double flops_amount) : Exec(), flops_amount_(fl Exec* ExecSeq::start() { - simix::simcall([this] { - boost::static_pointer_cast(pimpl_)->start(flops_amount_, 1. / priority_, bound_); + kernel::actor::simcall([this] { + (*boost::static_pointer_cast(pimpl_)) + .set_name(name_) + .set_tracing_category(tracing_category_) + .set_sharing_penalty(1. / priority_) + .set_bound(bound_) + .set_flops_amount(flops_amount_) + .start(); }); state_ = State::STARTED; - on_start(Actor::self()); + on_start(*Actor::self(), *this); return this; } @@ -130,32 +175,24 @@ ExecPtr ExecSeq::set_host(Host* host) "Cannot change the host of an exec once it's done (state: %d)", (int)state_); if (state_ == State::STARTED) boost::static_pointer_cast(pimpl_)->migrate(host); - host_ = host; - boost::static_pointer_cast(pimpl_)->host_ = host; + boost::static_pointer_cast(pimpl_)->set_host(host); return this; } - -/** @brief Retrieve the host on which this activity takes place. */ -Host* ExecSeq::get_host() -{ - return host_; -} - /** @brief Returns the amount of flops that remain to be done */ double ExecSeq::get_remaining() { - return simgrid::simix::simcall( + return simgrid::kernel::actor::simcall( [this]() { return boost::static_pointer_cast(pimpl_)->get_remaining(); }); } -/** @brief Returns the ratio of elements that are still to do +/** @brief Returns the ratio of elements that are still to do * * The returned value is between 0 (completely done) and 1 (nothing done yet). */ double ExecSeq::get_remaining_ratio() { - return simgrid::simix::simcall([this]() { + return simgrid::kernel::actor::simcall([this]() { return boost::static_pointer_cast(pimpl_)->get_seq_remaining_ratio(); }); } @@ -165,24 +202,26 @@ ExecPar::ExecPar(const std::vector& hosts, const std::vector const std::vector& bytes_amounts) : Exec(), hosts_(hosts), flops_amounts_(flops_amounts), bytes_amounts_(bytes_amounts) { - // For parallel executions, we need a special host to run the timeout detector. - host_ = hosts.front(); - boost::static_pointer_cast(pimpl_)->host_ = host_; } Exec* ExecPar::start() { - simix::simcall([this] { - boost::static_pointer_cast(pimpl_)->set_timeout(timeout_); - boost::static_pointer_cast(pimpl_)->start(hosts_, flops_amounts_, bytes_amounts_); + 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(); }); state_ = State::STARTED; - on_start(Actor::self()); + on_start(*Actor::self(), *this); return this; } + double ExecPar::get_remaining_ratio() { - return simix::simcall( + return kernel::actor::simcall( [this]() { return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); }); }