-/* 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. */
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()
+Exec::Exec(sg_host_t host, double flops_amount) : Activity(), host_(host), flops_amount_(flops_amount)
{
- pimpl_ = simcall_execution_start(name_, tracing_category_, flops_amount_, 1. / priority_, bound_, host_);
+ Activity::set_remaining(flops_amount_);
+ pimpl_ = simix::simcall([this] {
+ return kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl(name_, tracing_category_,
+ /*timeout_detector*/ nullptr, host_));
+ });
+}
+
+Exec* Exec::start()
+{
+ simix::simcall(
+ [this] { static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->start(flops_amount_, 1. / priority_, bound_); });
state_ = State::STARTED;
+ on_start(Actor::self());
return this;
}
-Activity* Exec::cancel()
+Exec* Exec::cancel()
{
- simcall_execution_cancel(pimpl_);
+ simgrid::simix::simcall([this] { static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->cancel(); });
state_ = State::CANCELED;
return this;
}
-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;
if (state_ == State::STARTED)
boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->migrate(host);
host_ = host;
+ boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(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;
+ name_ = std::move(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;
+ tracing_category_ = std::move(category);
return this;
}