namespace simgrid {
namespace s4u {
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Exec::on_start;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Exec::on_completion;
Activity* Exec::start()
{
- pimpl_ = simcall_execution_start(name_, flops_amount_, 1. / priority_, bound_, host_);
+ pimpl_ = simcall_execution_start(name_, tracing_category_, flops_amount_, 1. / priority_, bound_, host_);
state_ = State::STARTED;
+ on_start(Actor::self());
+ return this;
+}
+
+Activity* Exec::cancel()
+{
+ simgrid::simix::simcall([this] { dynamic_cast<kernel::activity::ExecImpl*>(pimpl_.get())->cancel(); });
+ state_ = State::CANCELED;
return this;
}
Activity* 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)
+Activity* Exec::wait_for(double timeout)
{
THROW_UNIMPLEMENTED;
return this;
ExecPtr Exec::set_tracing_category(std::string category)
{
- xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start");
- if (category.empty())
- return this;
-
- simgrid::simix::simcall([this, category] {
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->set_category(category);
- });
+ xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start");
+ tracing_category_ = category;
return this;
}