X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41efdce0277c52d55f27af300df9821cbd18c12c..1a64ca4c11a1eb7ba2ecd102f877ac571486a034:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index fc685eda24..0e380119ca 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "simgrid/s4u/Exec.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "simgrid/Exception.hpp" #include "simgrid/modelchecker.h" @@ -17,11 +18,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); -void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro, double timeout) -{ - synchro->wait_for(simcall->issuer_, timeout); -} - void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[], size_t count, double timeout) { @@ -29,6 +25,7 @@ void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kerne simcall->timeout_cb_ = nullptr; } else { simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() { + simcall->timeout_cb_ = nullptr; for (size_t i = 0; i < count; i++) { // Remove the first occurrence of simcall: auto* exec = execs[i]; @@ -59,6 +56,16 @@ namespace simgrid { namespace kernel { namespace activity { +ExecImpl::ExecImpl() +{ + piface_ = new s4u::Exec(this); + actor::ActorImpl* self = actor::ActorImpl::self(); + if (self) { + actor_ = self; + self->activities_.emplace_back(this); + } +} + ExecImpl& ExecImpl::set_host(s4u::Host* host) { hosts_.assign(1, host); @@ -73,7 +80,7 @@ ExecImpl& ExecImpl::set_hosts(const std::vector& hosts) ExecImpl& ExecImpl::set_timeout(double timeout) { - if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) { + if (timeout >= 0 && not MC_is_active() && not MC_record_replay_is_active()) { timeout_detector_.reset(hosts_.front()->pimpl_cpu->sleep(timeout)); timeout_detector_->set_activity(this); } @@ -120,37 +127,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(); @@ -176,11 +152,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 * process can be killed if it runs on that host itself */ state_ = State::FAILED; - } else if (surf_action_ && surf_action_->get_state() == resource::Action::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 */ state_ = State::CANCELED; } else if (timeout_detector_ && timeout_detector_->get_state() == resource::Action::State::FINISHED) { @@ -189,8 +166,14 @@ void ExecImpl::post() state_ = State::DONE; } + get_iface()->set_finish_time(surf_action_->get_finish_time()); + clean_action(); timeout_detector_.reset(); + if (actor_) { + actor_->activities_.remove(this); + actor_ = nullptr; + } /* Answer all simcalls associated with the synchro */ finish(); } @@ -205,9 +188,9 @@ void ExecImpl::finish() * list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the * simcall */ - if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case + if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case continue; // if process handling comm is killed - if (simcall->call_ == SIMCALL_EXECUTION_WAITANY_FOR) { + if (simcall->call_ == simix::Simcall::EXECUTION_WAITANY_FOR) { simgrid::kernel::activity::ExecImpl** execs = simcall_execution_waitany_for__get__execs(simcall); size_t count = simcall_execution_waitany_for__get__count(simcall); @@ -230,7 +213,6 @@ void ExecImpl::finish() simcall_execution_waitany_for__set__result(simcall, rank); } } - switch (state_) { case State::DONE: /* do nothing, synchro done */ @@ -261,7 +243,7 @@ void ExecImpl::finish() xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast(state_)); } - simcall->issuer_->waiting_synchro = nullptr; + simcall->issuer_->waiting_synchro_ = nullptr; /* Fail the process if the host is down */ if (simcall->issuer_->get_host()->is_on()) simcall->issuer_->simcall_answer();