-/* 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()
{
pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl());
}
+ExecPtr Exec::init()
+{
+ return ExecPtr(new Exec());
+}
+
Exec* Exec::wait()
{
return this->wait_for(-1);
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)
{
- auto rexecs = std::make_unique<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);
+ int changed_pos = simcall_execution_waitany_for(rexecs.data(), rexecs.size(), timeout);
if (changed_pos != -1)
execs->at(changed_pos)->release_dependencies();
return changed_pos;
pimpl_->suspend();
state_ = State::STARTED;
- on_start(*Actor::self(), *this);
+ on_start(*this);
return this;
}