simgrid::kernel::activity::ExecImpl::~ExecImpl()
{
- if (surf_exec)
- surf_exec->unref();
+ if (surfAction_)
+ surfAction_->unref();
if (timeoutDetector)
timeoutDetector->unref();
XBT_DEBUG("Destroy exec %p", this);
}
void simgrid::kernel::activity::ExecImpl::suspend()
{
- XBT_VERB("This exec is suspended (remain: %f)", surf_exec->getRemains());
- if (surf_exec)
- surf_exec->suspend();
+ XBT_VERB("This exec is suspended (remain: %f)", surfAction_->getRemains());
+ if (surfAction_)
+ surfAction_->suspend();
}
void simgrid::kernel::activity::ExecImpl::resume()
{
- XBT_VERB("This exec is resumed (remain: %f)", surf_exec->getRemains());
- if (surf_exec)
- surf_exec->resume();
+ XBT_VERB("This exec is resumed (remain: %f)", surfAction_->getRemains());
+ if (surfAction_)
+ surfAction_->resume();
}
double simgrid::kernel::activity::ExecImpl::remains()
{
- if (state == SIMIX_RUNNING)
- return surf_exec->getRemains();
+ xbt_assert(host_ != nullptr, "Calling remains() on a parallel execution is not allowed. "
+ "We would need to return a vector instead of a scalar. "
+ "Did you meant remainingRatio() instead?");
- return 0;
+ return surfAction_ ? surfAction_->getRemains() : 0;
+}
+double simgrid::kernel::activity::ExecImpl::remainingRatio()
+{
+ if (host_ == nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::remains())
+ return surfAction_->getRemains();
+ else // Actually compute the ratio for sequential tasks
+ return surfAction_->getRemains() / surfAction_->getCost();
}
void simgrid::kernel::activity::ExecImpl::post()
/* If the host running the synchro failed, notice it. This way, the asking
* process can be killed if it runs on that host itself */
state = SIMIX_FAILED;
- } else if (surf_exec->getState() == simgrid::surf::Action::State::failed) {
+ } else if (surfAction_->getState() == simgrid::surf::Action::State::failed) {
/* If the host running the synchro didn't fail, then the synchro was canceled */
state = SIMIX_CANCELED;
} else if (timeoutDetector && timeoutDetector->getState() == simgrid::surf::Action::State::done) {
state = SIMIX_DONE;
}
- if (surf_exec) {
- surf_exec->unref();
- surf_exec = nullptr;
+ if (surfAction_) {
+ surfAction_->unref();
+ surfAction_ = nullptr;
}
if (timeoutDetector) {
timeoutDetector->unref();