X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9a86ac48ea8d06ddebe18744c40548a9f65956f..fbf5fafb60eb44c0c00a7283fd05a6dec5f2b58f:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 94da9d2bd3..c3431b5efb 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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. */ @@ -12,51 +12,89 @@ 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_, tracing_category_, flops_amount_, 1. / priority_, bound_, host_); - state_ = State::STARTED; - return this; + pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl(name_, tracing_category_)); } -Activity* Exec::cancel() +bool Exec::test() { - simcall_execution_cancel(pimpl_); - state_ = State::CANCELED; - return this; + xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED); + + if (state_ == State::FINISHED) + return true; + + if (state_ == State::INITED) + this->start(); + + if (simcall_execution_test(pimpl_)) { + state_ = State::FINISHED; + return true; + } + + return false; } -Activity* Exec::wait() +Exec* Exec::wait() { + if (state_ == State::INITED) + start(); simcall_execution_wait(pimpl_); state_ = State::FINISHED; + on_completion(Actor::self()); return this; } -Activity* Exec::wait(double timeout) +Exec* Exec::wait_for(double) { THROW_UNIMPLEMENTED; - return this; } -/** @brief Returns whether the state of the exec is finished */ -bool Exec::test() +Exec* Exec::cancel() { - xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED); + simix::simcall([this] { boost::static_pointer_cast(pimpl_)->cancel(); }); + state_ = State::CANCELED; + return this; +} - if (state_ == State::FINISHED) - return true; +void intrusive_ptr_release(simgrid::s4u::Exec* e) +{ + if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) { + std::atomic_thread_fence(std::memory_order_acquire); + delete e; + } +} - if (state_ == State::INITED) - this->start(); +void intrusive_ptr_add_ref(simgrid::s4u::Exec* e) +{ + e->refcount_.fetch_add(1, std::memory_order_relaxed); +} - if (simcall_execution_test(pimpl_)) { - state_ = State::FINISHED; - return true; - } +/** @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; + return this; +} +ExecPtr Exec::set_timeout(double timeout) +{ + xbt_assert(state_ == State::INITED, "Cannot change the bound of an exec after its start"); + timeout_ = timeout; + return this; +} - return false; +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 Change the execution priority, don't you think? @@ -72,52 +110,54 @@ 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) +ExecPtr Exec::set_tracing_category(const std::string& category) { - xbt_assert(state_ == State::INITED, "Cannot change the bound of an exec after its start"); - bound_ = bound; + 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) +{ + Activity::set_remaining(flops_amount_); + boost::static_pointer_cast(pimpl_)->set_host(host); +} + +Exec* ExecSeq::start() +{ + simix::simcall([this] { + boost::static_pointer_cast(pimpl_)->start(flops_amount_, 1. / priority_, bound_); + }); + state_ = State::STARTED; + on_start(Actor::self()); + return this; +} + +/** @brief Returns whether the state of the exec is finished */ /** @brief Change the host on which this activity takes place. * * The activity cannot be terminated already (but it may be started). */ -ExecPtr Exec::set_host(Host* host) +ExecPtr ExecSeq::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_)->host_ = host; return this; } -ExecPtr Exec::set_name(std::string name) -{ - xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start"); - name_ = name; - return this; -} - -ExecPtr Exec::set_tracing_category(std::string category) -{ - xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start"); - tracing_category_ = category; - return this; -} /** @brief Retrieve the host on which this activity takes place. */ -Host* Exec::get_host() +Host* ExecSeq::get_host() { return host_; } /** @brief Returns the amount of flops that remain to be done */ -double Exec::get_remaining() +double ExecSeq::get_remaining() { return simgrid::simix::simcall( [this]() { return boost::static_pointer_cast(pimpl_)->get_remaining(); }); @@ -127,24 +167,43 @@ double Exec::get_remaining() * * The returned value is between 0 (completely done) and 1 (nothing done yet). */ -double Exec::get_remaining_ratio() +double ExecSeq::get_remaining_ratio() { return simgrid::simix::simcall([this]() { - return boost::static_pointer_cast(pimpl_)->get_remaining_ratio(); + return boost::static_pointer_cast(pimpl_)->get_seq_remaining_ratio(); }); } -void intrusive_ptr_release(simgrid::s4u::Exec* e) +///////////// PARALLEL EXECUTIONS //////// +ExecPar::ExecPar(const std::vector& hosts, const std::vector& flops_amounts, + const std::vector& bytes_amounts) + : Exec(), hosts_(hosts), flops_amounts_(flops_amounts), bytes_amounts_(bytes_amounts) { - if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) { - std::atomic_thread_fence(std::memory_order_acquire); - delete e; - } + // For parallel executions, we need a special host to run the timeout detector. + host_ = hosts.front(); + boost::static_pointer_cast(pimpl_)->host_ = host_; } -void intrusive_ptr_add_ref(simgrid::s4u::Exec* e) +Exec* ExecPar::start() { - e->refcount_.fetch_add(1, std::memory_order_relaxed); + simix::simcall([this] { + boost::static_pointer_cast(pimpl_)->set_timeout(timeout_); + boost::static_pointer_cast(pimpl_)->start(hosts_, flops_amounts_, bytes_amounts_); + }); + state_ = State::STARTED; + on_start(Actor::self()); + return this; +} +double ExecPar::get_remaining_ratio() +{ + return simix::simcall( + [this]() { return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); }); +} + +double ExecPar::get_remaining() +{ + XBT_WARN("Calling get_remaining() on a parallel execution is not allowed. Call get_remaining_ratio() instead."); + return get_remaining_ratio(); } } // namespace s4u } // namespace simgrid