X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd2865e1ce63170aba3f6d6dcfe6b007c52e8cba..bdaff2753e3c9371e8122ffaf0694581b458d80d:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 6cecccf6cf..ebfa43b320 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -93,14 +93,15 @@ void simgrid::kernel::activity::ExecImpl::set_priority(double priority) void simgrid::kernel::activity::ExecImpl::post() { - if (host_ && host_->isOff()) { /* FIXME: handle resource failure for parallel tasks too */ - /* 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_action_ && surf_action_->get_state() == simgrid::kernel::resource::Action::State::failed) { + if (host_ && host_->is_off()) { /* FIXME: handle resource failure for parallel tasks too */ + /* 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_action_ && surf_action_->get_state() == simgrid::kernel::resource::Action::State::FAILED) { /* If the host running the synchro didn't fail, then the synchro was canceled */ state_ = SIMIX_CANCELED; - } else if (timeout_detector_ && timeout_detector_->get_state() == simgrid::kernel::resource::Action::State::done) { + } else if (timeout_detector_ && + timeout_detector_->get_state() == simgrid::kernel::resource::Action::State::FINISHED) { state_ = SIMIX_TIMEOUT; } else { state_ = SIMIX_DONE;