-/* 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. */
namespace simgrid {
namespace s4u {
-xbt::signal<void(Actor const&, Exec const&)> Exec::on_start;
-xbt::signal<void(Actor const&, Exec const&)> Exec::on_completion;
+xbt::signal<void(Exec const&)> Exec::on_start;
+xbt::signal<void(Exec const&)> 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()
kernel::actor::ActorImpl* issuer = Actor::self()->get_impl();
kernel::actor::simcall_blocking<void>([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<ExecPtr>* execs, double timeout)
{
- std::unique_ptr<kernel::activity::ExecImpl* []> rexecs(new kernel::activity::ExecImpl*[execs->size()]);
- std::transform(begin(*execs), end(*execs), rexecs.get(),
+ std::vector<kernel::activity::ExecImpl*> rexecs(execs->size());
+ std::transform(begin(*execs), end(*execs), begin(rexecs),
[](const ExecPtr& exec) { return static_cast<kernel::activity::ExecImpl*>(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;
}
{
return static_cast<kernel::activity::ExecImpl*>(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();
* 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<kernel::activity::ExecImpl>(pimpl_)->migrate(host);
+
boost::static_pointer_cast<kernel::activity::ExecImpl>(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<Host*>& 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;
}
pimpl_->suspend();
state_ = State::STARTED;
- on_start(*Actor::self(), *this);
+ start_time_ = pimpl_->surf_action_->get_start_time();
+ on_start(*this);
return this;
}