X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/982d2df4bf2b7506782681394ab0fb1a89d50fad..b372d23d3d8818b4547ef207f43b45709298a002:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index a61217da96..9bbf840f50 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -1,8 +1,10 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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/Exception.hpp" +#include "simgrid/exec.h" #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" #include "src/kernel/activity/ExecImpl.hpp" @@ -12,44 +14,114 @@ 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; -Activity* Exec::start() +Exec::Exec() { - pimpl_ = simcall_execution_start(name_, flops_amount_, 1. / priority_, bound_, host_); - state_ = State::STARTED; - return this; + pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); } -Activity* Exec::wait() +Exec* Exec::wait() { - simcall_execution_wait(pimpl_); + return this->wait_for(-1); +} + +Exec* Exec::wait_for(double timeout) +{ + if (state_ == State::INITED) + vetoable_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(); return this; } -Activity* Exec::wait(double timeout) +int Exec::wait_any_for(std::vector* execs, double timeout) { - THROW_UNIMPLEMENTED; + std::vector rexecs(execs->size()); + 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); + if (changed_pos != -1) + execs->at(changed_pos)->release_dependencies(); + return changed_pos; +} + +Exec* Exec::cancel() +{ + kernel::actor::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); + state_ = State::CANCELED; return this; } -/** @brief Returns whether the state of the exec is finished */ -bool Exec::test() +/** @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 || state_ == State::STARTED || state_ == State::FINISHED); + xbt_assert(state_ == State::INITED, "Cannot change the bound of an exec after its start"); + bound_ = bound; + 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; + return this; +} - if (state_ == State::FINISHED) - return true; +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()); + return this; +} - if (state_ == State::INITED) - this->start(); +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; + parallel_ = true; + return this; +} - if (simcall_execution_test(pimpl_)) { - state_ = State::FINISHED; - return true; - } +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; + parallel_ = true; + return this; +} - return false; +/** @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? @@ -65,17 +137,6 @@ ExecPtr Exec::set_priority(double priority) return this; } -/** @brief change the execution bound, ie 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; - return this; -} - /** @brief Change the host on which this activity takes place. * * The activity cannot be terminated already (but it may be started). */ @@ -84,65 +145,175 @@ ExecPtr Exec::set_host(Host* host) xbt_assert(state_ == State::INITED || state_ == State::STARTED, "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_)->migrate(host); + boost::static_pointer_cast(pimpl_)->set_host(host); return this; } -ExecPtr Exec::set_name(std::string name) +ExecPtr Exec::set_hosts(const std::vector& hosts) { - xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start"); - name_ = name; + xbt_assert(state_ == State::INITED, "Cannot change the hosts of an exec once it's done (state: %d)", (int)state_); + hosts_ = hosts; + parallel_ = true; return this; } -ExecPtr Exec::set_tracing_category(std::string category) +///////////// SEQUENTIAL EXECUTIONS //////// +Exec* Exec::start() { - xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start"); - if (category.empty()) - return this; + 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(); + }); - simgrid::simix::simcall([this, category] { - boost::static_pointer_cast(pimpl_)->set_category(category); - }); - return this; -} + if (suspended_) + pimpl_->suspend(); -/** @brief Retrieve the host on which this activity takes place. */ -Host* Exec::get_host() -{ - return host_; + state_ = State::STARTED; + on_start(*this); + return this; } -/** @brief Returns the amount of flops that remain to be done */ -double Exec::get_remaining() +double Exec::get_remaining() const { - return simgrid::simix::simcall( - [this]() { return boost::static_pointer_cast(pimpl_)->get_remaining(); }); + if (is_parallel()) { + XBT_WARN("Calling get_remaining() on a parallel execution is not allowed. Call get_remaining_ratio() instead."); + return get_remaining_ratio(); + } else + return 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 Exec::get_remaining_ratio() +double Exec::get_remaining_ratio() const { - return simgrid::simix::simcall([this]() { - return boost::static_pointer_cast(pimpl_)->get_remaining_ratio(); - }); + if (is_parallel()) + return kernel::actor::simcall( + [this]() { return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); }); + else + return kernel::actor::simcall( + [this]() { return boost::static_pointer_cast(pimpl_)->get_seq_remaining_ratio(); }); } -void intrusive_ptr_release(simgrid::s4u::Exec* e) +} // namespace s4u +} // namespace simgrid +/* **************************** Public C interface *************************** */ +void sg_exec_set_bound(sg_exec_t exec, double bound) +{ + exec->set_bound(bound); +} + +const char* sg_exec_get_name(const_sg_exec_t exec) { - if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) { - std::atomic_thread_fence(std::memory_order_acquire); - delete e; + return exec->get_cname(); +} + +void sg_exec_set_name(sg_exec_t exec, const char* name) +{ + exec->set_name(name); +} + +void sg_exec_set_host(sg_exec_t exec, sg_host_t new_host) +{ + exec->set_host(new_host); +} + +double sg_exec_get_remaining(const_sg_exec_t exec) +{ + return exec->get_remaining(); +} + +double sg_exec_get_remaining_ratio(const_sg_exec_t exec) +{ + return exec->get_remaining_ratio(); +} + +void sg_exec_start(sg_exec_t exec) +{ + exec->start(); +} + +void sg_exec_cancel(sg_exec_t exec) +{ + exec->cancel(); + exec->unref(); +} + +int sg_exec_test(sg_exec_t exec) +{ + bool finished = exec->test(); + if (finished) + exec->unref(); + return finished; +} + +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; } -void intrusive_ptr_add_ref(simgrid::s4u::Exec* e) +sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout) { - e->refcount_.fetch_add(1, std::memory_order_relaxed); + sg_error_t status = SG_OK; + + simgrid::s4u::ExecPtr s4u_exec(exec, false); + try { + s4u_exec->wait_for(timeout); + } 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; +} + +int sg_exec_wait_any(sg_exec_t* execs, size_t count) +{ + return sg_exec_wait_any_for(execs, count, -1); +} + +int sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout) +{ + std::vector s4u_execs; + for (unsigned int i = 0; i < count; i++) + s4u_execs.emplace_back(execs[i], false); + + int pos = simgrid::s4u::Exec::wait_any_for(&s4u_execs, timeout); + for (unsigned i = 0; i < count; i++) { + if (pos != -1 && static_cast(pos) != i) + s4u_execs[i]->add_ref(); + } + return pos; } -} // namespace s4u -} // namespace simgrid