X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56293e11c41ea2baf948bc3d680443a064834970..6b8dc0899319667769a220397df30b6dac0e2b8f:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index fc685eda24..433d9bae39 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -120,37 +120,6 @@ ExecImpl* ExecImpl::start() return this; } -void ExecImpl::wait_for(actor::ActorImpl* issuer, double timeout) -{ - XBT_DEBUG("Wait for execution of synchro %p, state %d", this, (int)state_); - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - - /* Associate this simcall to the synchro */ - register_simcall(&issuer->simcall); - - if (MC_is_active() || MC_record_replay_is_active()) { - int idx = SIMCALL_GET_MC_VALUE(issuer->simcall); - if (idx == 0) { - state_ = simgrid::kernel::activity::State::DONE; - } else { - /* If we reached this point, the wait simcall must have a timeout */ - /* Otherwise it shouldn't be enabled and executed by the MC */ - if (timeout < 0.0) - THROW_IMPOSSIBLE; - state_ = simgrid::kernel::activity::State::TIMEOUT; - } - finish(); - return; - } - - /* If the synchro is already finished then perform the error handling */ - if (state_ != simgrid::kernel::activity::State::RUNNING) { - finish(); - } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */ - set_timeout(timeout); - } -} - double ExecImpl::get_seq_remaining_ratio() { return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();