pimpl_ = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl());
}
-bool Exec::test()
-{
- xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
- state_ == State::FINISHED);
-
- if (state_ == State::FINISHED)
- return true;
-
- if (state_ == State::INITED || state_ == State::STARTING)
- this->vetoable_start();
-
- if (simcall_execution_test(pimpl_)) {
- state_ = State::FINISHED;
- return true;
- }
-
- return false;
-}
-
Exec* Exec::wait()
{
return this->wait_for(-1);
Exec* Exec::wait_for(double timeout)
{
if (state_ == State::INITED)
- start();
- simcall_execution_wait(pimpl_, timeout);
+ vetoable_start();
+
+ 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);
this->release_dependencies();
std::unique_ptr<kernel::activity::ExecImpl* []> rexecs(new kernel::activity::ExecImpl*[execs->size()]);
std::transform(begin(*execs), end(*execs), rexecs.get(),
[](const ExecPtr& exec) { return static_cast<kernel::activity::ExecImpl*>(exec->pimpl_.get()); });
- return simcall_execution_waitany_for(rexecs.get(), execs->size(), timeout);
+
+ int changed_pos = simcall_execution_waitany_for(rexecs.get(), execs->size(), timeout);
+ if (changed_pos != -1)
+ execs->at(changed_pos)->release_dependencies();
+ return changed_pos;
}
Exec* Exec::cancel()
return this;
}
-/** @brief Returns the amount of flops that remain to be done */
-double ExecSeq::get_remaining()
+double ExecSeq::get_remaining() const
{
return kernel::actor::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_remaining(); });
*
* The returned value is between 0 (completely done) and 1 (nothing done yet).
*/
-double ExecSeq::get_remaining_ratio()
+double ExecSeq::get_remaining_ratio() const
{
return kernel::actor::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_seq_remaining_ratio(); });
return this;
}
-double ExecPar::get_remaining_ratio()
+double ExecPar::get_remaining_ratio() const
{
return kernel::actor::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_par_remaining_ratio(); });
}
-double ExecPar::get_remaining()
+double ExecPar::get_remaining() const
{
XBT_WARN("Calling get_remaining() on a parallel execution is not allowed. Call get_remaining_ratio() instead.");
return get_remaining_ratio();