X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df308bdc5212ab9944427c118fdf6a9cd84221ed..d78a7f87e28a15c0f1e71e4510a055554e0e5e9b:/src/kernel/activity/ExecImpl.cpp?ds=inline diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 40b9f95160..0f925c9600 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -158,12 +158,12 @@ ExecImpl& ExecImpl::set_sharing_penalty(double sharing_penalty) void ExecImpl::post() { xbt_assert(surf_action_ != nullptr); - if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */ - /* If the host running the synchro failed, notice it. This way, the asking + if (std::any_of(hosts_.begin(), hosts_.end(), [](const s4u::Host* host) { return not host->is_on(); })) { + /* If one of the hosts running the synchro failed, notice it. This way, the asking * process can be killed if it runs on that host itself */ state_ = State::FAILED; } else if (surf_action_->get_state() == resource::Action::State::FAILED) { - /* If the host running the synchro didn't fail, then the synchro was canceled */ + /* If all the hosts are running the synchro didn't fail, then the synchro was canceled */ state_ = State::CANCELED; } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) { if (surf_action_->get_remains() > 0.0) { @@ -270,9 +270,7 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to) new_action->set_remains(old_action->get_remains()); new_action->set_activity(this); new_action->set_sharing_penalty(old_action->get_sharing_penalty()); - - // FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling. - // I hope that the user did not provide any. + new_action->set_user_bound(old_action->get_user_bound()); old_action->set_activity(nullptr); old_action->cancel();