X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01b6b0c026e5fa6a87a45b53a4ce1e4dc580a358..d3c3c5a5d42d3147315c7b9080025558610e5502:/src/kernel/activity/ExecImpl.cpp diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index c1b58d5157..5b60a5781a 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -13,6 +13,8 @@ #include "simgrid/s4u/Host.hpp" +#include + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro) @@ -20,8 +22,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_); /* Associate this simcall to the synchro */ - synchro->simcalls_.push_back(simcall); - simcall->issuer->waiting_synchro = synchro; + synchro->register_simcall(simcall); /* set surf's synchro */ if (MC_is_active() || MC_record_replay_is_active()) { @@ -37,7 +38,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro) { - int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); + bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); if (res) { synchro->simcalls_.push_back(simcall); synchro->finish(); @@ -47,6 +48,38 @@ void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::acti simcall_execution_test__set__result(simcall, res); } +void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execs[], + size_t count, double timeout) +{ + if (timeout < 0.0) { + simcall->timer = nullptr; + } else { + simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() { + for (size_t i = 0; i < count; i++) { + // Remove the first occurence of simcall: + auto* exec = execs[i]; + auto j = boost::range::find(exec->simcalls_, simcall); + if (j != exec->simcalls_.end()) + exec->simcalls_.erase(j); + } + simcall_execution_waitany_for__set__result(simcall, -1); + SIMIX_simcall_answer(simcall); + }); + } + + for (size_t i = 0; i < count; i++) { + /* associate this simcall to the the synchro */ + auto* exec = execs[i]; + exec->simcalls_.push_back(simcall); + + /* see if the synchro is already finished */ + if (exec->state_ != SIMIX_WAITING && exec->state_ != SIMIX_RUNNING) { + exec->finish(); + break; + } + } +} + namespace simgrid { namespace kernel { namespace activity { @@ -76,7 +109,7 @@ ExecImpl& ExecImpl::set_timeout(double timeout) { if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) { timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout); - timeout_detector_->set_data(this); + timeout_detector_->set_activity(this); } return *this; } @@ -116,7 +149,7 @@ ExecImpl* ExecImpl::start() } else { surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1); } - surf_action_->set_data(this); + surf_action_->set_activity(this); } XBT_DEBUG("Create execute synchro %p: %s", this, get_cname()); @@ -164,10 +197,8 @@ void ExecImpl::post() on_completion(*this); - if (surf_action_) { - surf_action_->unref(); - surf_action_ = nullptr; - } + clean_action(); + if (timeout_detector_) { timeout_detector_->unref(); timeout_detector_ = nullptr; @@ -183,6 +214,37 @@ void ExecImpl::finish() while (not simcalls_.empty()) { smx_simcall_t simcall = simcalls_.front(); simcalls_.pop_front(); + + /* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany + * 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 + continue; // if process handling comm is killed + if (simcall->call == 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); + + for (size_t i = 0; i < count; i++) { + // Remove the first occurence of simcall: + auto* exec = execs[i]; + auto j = boost::range::find(exec->simcalls_, simcall); + if (j != exec->simcalls_.end()) + exec->simcalls_.erase(j); + + if (simcall->timer) { + simcall->timer->remove(); + simcall->timer = nullptr; + } + } + + if (not MC_is_active() && not MC_record_replay_is_active()) { + ExecImpl** element = std::find(execs, execs + count, this); + int rank = (element != execs + count) ? element - execs : -1; + simcall_execution_waitany_for__set__result(simcall, rank); + } + } + switch (state_) { case SIMIX_DONE: @@ -215,8 +277,6 @@ void ExecImpl::finish() } simcall->issuer->waiting_synchro = nullptr; - simcall_execution_wait__set__result(simcall, state_); - /* Fail the process if the host is down */ if (simcall->issuer->get_host()->is_on()) SIMIX_simcall_answer(simcall); @@ -231,13 +291,13 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to) resource::Action* old_action = this->surf_action_; resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost()); new_action->set_remains(old_action->get_remains()); - new_action->set_data(this); + new_action->set_activity(this); new_action->set_priority(old_action->get_priority()); // 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. - old_action->set_data(nullptr); + old_action->set_activity(nullptr); old_action->cancel(); old_action->unref(); this->surf_action_ = new_action;