X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5c102f3397e8112b97c27981bfdbcaac76d79f6..ac080087b39ef79ff497d3992ff04b3e20fe40b2:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 89f738684c..2511d76097 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -12,8 +12,8 @@ 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() { @@ -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,24 +53,19 @@ Exec* Exec::wait_for(double) THROW_UNIMPLEMENTED; } -Exec* Exec::cancel() -{ - simix::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); - state_ = State::CANCELED; - return this; -} - -void intrusive_ptr_release(simgrid::s4u::Exec* e) +int Exec::wait_any_for(std::vector* execs, double timeout) { - if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) { - std::atomic_thread_fence(std::memory_order_acquire); - delete e; - } + 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); } -void intrusive_ptr_add_ref(simgrid::s4u::Exec* e) +Exec* Exec::cancel() { - e->refcount_.fetch_add(1, std::memory_order_relaxed); + kernel::actor::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); + state_ = State::CANCELED; + return this; } /** @brief change the execution bound @@ -90,11 +85,28 @@ ExecPtr Exec::set_timeout(double timeout) return this; } -ExecPtr Exec::set_name(const std::string& name) +/** @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 { - xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start"); - name_ = name; - return this; + 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? @@ -110,13 +122,6 @@ ExecPtr Exec::set_priority(double priority) return this; } -ExecPtr Exec::set_tracing_category(const std::string& category) -{ - xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start"); - tracing_category_ = category; - return this; -} - ///////////// SEQUENTIAL EXECUTIONS //////// ExecSeq::ExecSeq(sg_host_t host, double flops_amount) : Exec(), flops_amount_(flops_amount) { @@ -126,14 +131,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_) - ->set_name(name_) - ->set_tracing_category(tracing_category_) - ->start(flops_amount_, 1. / priority_, bound_); + 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_amount_) + .start(); }); state_ = State::STARTED; - on_start(*Actor::self()); + on_start(*Actor::self(), *this); return this; } @@ -147,32 +155,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(); }); } @@ -182,24 +182,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(); }); }