X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bc85164acb335cf909052b966b2ee4932e06cd7..c289d4000456585abcc7da6fcb32e79510537750:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 7908468702..09a52752ea 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -14,12 +14,18 @@ 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() +Exec::Exec(kernel::activity::ExecImplPtr pimpl) { - pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); + pimpl_ = pimpl; +} + +ExecPtr Exec::init() +{ + auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); + return ExecPtr(pimpl->get_iface()); } Exec* Exec::wait() @@ -35,20 +41,22 @@ Exec* Exec::wait_for(double timeout) 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(*Actor::self(), *this); + on_completion(*this); this->release_dependencies(); return this; } 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(), + 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.get(), execs->size(), timeout); - if (changed_pos != -1) + int changed_pos = simcall_execution_waitany_for(rexecs.data(), rexecs.size(), timeout); + if (changed_pos != -1) { + on_completion(*(execs->at(changed_pos))); execs->at(changed_pos)->release_dependencies(); + } return changed_pos; } @@ -65,20 +73,23 @@ Exec* Exec::cancel() */ ExecPtr Exec::set_bound(double bound) { - xbt_assert(state_ == State::INITED, "Cannot change the bound of an exec after its start"); + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "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"); + xbt_assert(state_ == State::INITED|| state_ == State::STARTING, + "Cannot change the bound of an exec after its start"); timeout_ = timeout; return this; } ExecPtr Exec::set_flops_amount(double flops_amount) { - xbt_assert(state_ == State::INITED, "Cannot change the flop_amount of an exec after its start"); + 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()); return this; @@ -86,7 +97,8 @@ ExecPtr Exec::set_flops_amount(double flops_amount) 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"); + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the flops_amounts of an exec after its start"); flops_amounts_ = flops_amounts; parallel_ = true; return this; @@ -94,7 +106,8 @@ ExecPtr Exec::set_flops_amounts(const std::vector& flops_amounts) 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"); + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the bytes_amounts of an exec after its start"); bytes_amounts_ = bytes_amounts; parallel_ = true; return this; @@ -111,14 +124,6 @@ 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(); @@ -142,19 +147,34 @@ ExecPtr Exec::set_priority(double priority) * The activity cannot be terminated already (but it may be started). */ ExecPtr Exec::set_host(Host* host) { - xbt_assert(state_ == State::INITED || state_ == State::STARTED, + 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); + if (state_ == State::STARTED) boost::static_pointer_cast(pimpl_)->migrate(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 + vetoable_start(); + return this; } ExecPtr Exec::set_hosts(const std::vector& hosts) { - xbt_assert(state_ == State::INITED, "Cannot change the hosts of an exec once it's done (state: %d)", (int)state_); + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the hosts of an exec once it's done (state: %d)", (int)state_); + hosts_ = hosts; parallel_ = true; + + // Setting the host may allow to start the activity, let's try + if (state_ == State::STARTING) + vetoable_start(); + return this; } @@ -185,7 +205,8 @@ Exec* Exec::start() pimpl_->suspend(); state_ = State::STARTED; - on_start(*Actor::self(), *this); + start_time_ = pimpl_->surf_action_->get_start_time(); + on_start(*this); return this; }