X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..d4abf745ddd1a9ad9480003c42964d55ec966f29:/src/s4u/s4u_Exec.cpp diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index 0275568c87..58b5abfc71 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -32,9 +32,9 @@ ExecPtr Exec::init() { auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl()); unsigned int cb_id = Host::on_state_change.connect([pimpl](s4u::Host const& h) { - if (not h.is_on() && pimpl->state_ == kernel::activity::State::RUNNING && + if (not h.is_on() && pimpl->get_state() == kernel::activity::State::RUNNING && std::find(pimpl->get_hosts().begin(), pimpl->get_hosts().end(), &h) != pimpl->get_hosts().end()) { - pimpl->state_ = kernel::activity::State::FAILED; + pimpl->set_state(kernel::activity::State::FAILED); pimpl->post(); } }); @@ -44,7 +44,7 @@ ExecPtr Exec::init() Exec* Exec::start() { - kernel::actor::simcall([this] { + kernel::actor::simcall_answered([this] { (*boost::static_pointer_cast(pimpl_)) .set_name(get_name()) .set_tracing_category(get_tracing_category()) @@ -61,20 +61,10 @@ Exec* Exec::start() ssize_t Exec::wait_any_for(const std::vector& execs, double timeout) { - std::vector rexecs(execs.size()); - std::transform(begin(execs), end(execs), begin(rexecs), - [](const ExecPtr& exec) { return static_cast(exec->pimpl_.get()); }); - - kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); - kernel::actor::ExecutionWaitanySimcall observer{issuer, rexecs, timeout}; - ssize_t changed_pos = kernel::actor::simcall_blocking( - [&observer] { - kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(), observer.get_timeout()); - }, - &observer); - if (changed_pos != -1) - execs.at(changed_pos)->complete(State::FINISHED); - return changed_pos; + std::vector activities; + for (const auto& exec : execs) + activities.push_back(boost::dynamic_pointer_cast(exec)); + return Activity::wait_any_for(activities, timeout); } /** @brief change the execution bound @@ -85,7 +75,7 @@ ExecPtr Exec::set_bound(double bound) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the bound of an exec after its start"); - kernel::actor::simcall( + kernel::actor::simcall_answered( [this, bound] { boost::static_pointer_cast(pimpl_)->set_bound(bound); }); return this; } @@ -100,7 +90,7 @@ ExecPtr Exec::set_priority(double priority) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the priority of an exec after its start"); - kernel::actor::simcall([this, priority] { + kernel::actor::simcall_answered([this, priority] { boost::static_pointer_cast(pimpl_)->set_sharing_penalty(1. / priority); }); return this; @@ -108,7 +98,7 @@ ExecPtr Exec::set_priority(double priority) ExecPtr Exec::update_priority(double priority) { - kernel::actor::simcall([this, priority] { + kernel::actor::simcall_answered([this, priority] { boost::static_pointer_cast(pimpl_)->update_sharing_penalty(1. / priority); }); return this; @@ -118,7 +108,7 @@ ExecPtr Exec::set_flops_amount(double flops_amount) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the flop_amount of an exec after its start"); - kernel::actor::simcall([this, flops_amount] { + kernel::actor::simcall_answered([this, flops_amount] { boost::static_pointer_cast(pimpl_)->set_flops_amount(flops_amount); }); Activity::set_remaining(flops_amount); @@ -129,7 +119,7 @@ ExecPtr Exec::set_flops_amounts(const std::vector& flops_amounts) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the flops_amounts of an exec after its start"); - kernel::actor::simcall([this, flops_amounts] { + kernel::actor::simcall_answered([this, flops_amounts] { boost::static_pointer_cast(pimpl_)->set_flops_amounts(flops_amounts); }); parallel_ = true; @@ -140,13 +130,23 @@ ExecPtr Exec::set_bytes_amounts(const std::vector& bytes_amounts) { xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the bytes_amounts of an exec after its start"); - kernel::actor::simcall([this, bytes_amounts] { + kernel::actor::simcall_answered([this, bytes_amounts] { boost::static_pointer_cast(pimpl_)->set_bytes_amounts(bytes_amounts); }); parallel_ = true; return this; } +ExecPtr Exec::set_thread_count(int thread_count) +{ + xbt_assert(state_ == State::INITED || state_ == State::STARTING, + "Cannot change the bytes_amounts of an exec after its start"); + kernel::actor::simcall_answered([this, thread_count] { + boost::static_pointer_cast(pimpl_)->set_thread_count(thread_count); + }); + 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. */ @@ -170,7 +170,7 @@ ExecPtr Exec::set_host(Host* host) if (state_ == State::STARTED) boost::static_pointer_cast(pimpl_)->migrate(host); - kernel::actor::simcall( + kernel::actor::simcall_answered( [this, host] { boost::static_pointer_cast(pimpl_)->set_host(host); }); if (state_ == State::STARTING) @@ -185,7 +185,7 @@ ExecPtr Exec::set_hosts(const std::vector& hosts) xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot change the hosts of an exec once it's done (state: %s)", to_c_str(state_)); - kernel::actor::simcall( + kernel::actor::simcall_answered( [this, hosts] { boost::static_pointer_cast(pimpl_)->set_hosts(hosts); }); parallel_ = true; @@ -223,7 +223,7 @@ double Exec::get_remaining() const 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( + return kernel::actor::simcall_answered( [this]() { return boost::static_pointer_cast(pimpl_)->get_remaining(); }); } @@ -234,10 +234,10 @@ double Exec::get_remaining() const double Exec::get_remaining_ratio() const { if (is_parallel()) - return kernel::actor::simcall( + return kernel::actor::simcall_answered( [this]() { return boost::static_pointer_cast(pimpl_)->get_par_remaining_ratio(); }); else - return kernel::actor::simcall( + return kernel::actor::simcall_answered( [this]() { return boost::static_pointer_cast(pimpl_)->get_seq_remaining_ratio(); }); }