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()
{
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);
+ 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;
.set_flops_amount(flops_amounts_.front())
.start();
});
+
+ if (suspended_)
+ pimpl_->suspend();
+
state_ = State::STARTED;
- on_start(*Actor::self(), *this);
+ on_start(*this);
return this;
}
exec->set_bound(bound);
}
+const char* sg_exec_get_name(const_sg_exec_t exec)
+{
+ return exec->get_cname();
+}
+
+void sg_exec_set_name(sg_exec_t exec, const char* name)
+{
+ exec->set_name(name);
+}
+
void sg_exec_set_host(sg_exec_t exec, sg_host_t new_host)
{
exec->set_host(new_host);
{
sg_error_t status = SG_OK;
+ simgrid::s4u::ExecPtr s4u_exec(exec, false);
try {
- exec->wait_for(-1);
+ s4u_exec->wait_for(-1);
} catch (const simgrid::TimeoutException&) {
status = SG_ERROR_TIMEOUT;
} catch (const simgrid::CancelException&) {
} catch (const simgrid::HostFailureException&) {
status = SG_ERROR_HOST;
}
- exec->unref();
return status;
}
sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout)
{
sg_error_t status = SG_OK;
+
+ simgrid::s4u::ExecPtr s4u_exec(exec, false);
try {
- exec->wait_for(timeout);
+ s4u_exec->wait_for(timeout);
} catch (const simgrid::TimeoutException&) {
status = SG_ERROR_TIMEOUT;
} catch (const simgrid::CancelException&) {
} catch (const simgrid::HostFailureException&) {
status = SG_ERROR_HOST;
}
- exec->unref();
return status;
}
+
+int sg_exec_wait_any(sg_exec_t* execs, size_t count)
+{
+ return sg_exec_wait_any_for(execs, count, -1);
+}
+
+int sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout)
+{
+ std::vector<simgrid::s4u::ExecPtr> s4u_execs;
+ for (unsigned int i = 0; i < count; i++)
+ s4u_execs.emplace_back(execs[i], false);
+
+ int pos = simgrid::s4u::Exec::wait_any_for(&s4u_execs, timeout);
+ for (unsigned i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<unsigned>(pos) != i)
+ s4u_execs[i]->add_ref();
+ }
+ return pos;
+}