X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6bbeb1829c36ff45b43ab25f9d8d3f53f554d98..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 5670d07021..6125c5e12f 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -1,17 +1,16 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-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 "src/mc/mc_state.hpp" -#include "src/mc/mc_comm_pattern.hpp" #include "src/mc/mc_config.hpp" -#include "src/mc/mc_request.hpp" -#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_api.hpp" #include using simgrid::mc::remote; +using mcapi = simgrid::mc::mc_api; namespace simgrid { namespace mc { @@ -19,14 +18,15 @@ namespace mc { State::State(unsigned long state_number) : num_(state_number) { this->internal_comm_.clear(); - - actor_states_.resize(MC_smx_get_maxpid()); + auto maxpid = mcapi::get().get_maxpid(); + actor_states_.resize(maxpid); /* Stateful model checking */ if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) { - system_state_ = std::make_shared(num_); + auto snapshot_ptr = mcapi::get().take_snapshot(num_); + system_state_ = std::shared_ptr(snapshot_ptr); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { - MC_state_copy_incomplete_communications_pattern(this); - MC_state_copy_index_communications_pattern(this); + copy_incomplete_comm_pattern(); + copy_index_comm_pattern(); } } } @@ -41,173 +41,23 @@ Transition State::get_transition() const return this->transition_; } -} -} - -/* Search an enabled transition for the given process. - * - * This can be seen as an iterator returning the next transition of the process. - * - * We only consider the processes that are both - * - marked "to be interleaved" in their ActorState (controlled by the checker algorithm). - * - which simcall can currently be executed (like a comm where the other partner is already known) - * Once we returned the last enabled transition of a process, it is marked done. - * - * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT - * (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition. - */ -static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::State* state, smx_actor_t actor) +void State::copy_incomplete_comm_pattern() { - /* reset the outgoing transition */ - simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()]; - state->transition_.pid_ = -1; - state->transition_.argument_ = -1; - state->executed_req_.call_ = SIMCALL_NONE; - - if (not simgrid::mc::actor_is_enabled(actor)) - return nullptr; // Not executable in the application - - smx_simcall_t req = nullptr; - switch (actor->simcall.call_) { - case SIMCALL_COMM_WAITANY: - state->transition_.argument_ = -1; - while (procstate->times_considered < simcall_comm_waitany__get__count(&actor->simcall)) { - if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) { - state->transition_.argument_ = procstate->times_considered; - ++procstate->times_considered; - break; - } - ++procstate->times_considered; - } - - if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall)) - procstate->set_done(); - if (state->transition_.argument_ != -1) - req = &actor->simcall; - break; - - case SIMCALL_COMM_TESTANY: { - unsigned start_count = procstate->times_considered; - state->transition_.argument_ = -1; - while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall)) { - if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) { - state->transition_.argument_ = procstate->times_considered; - ++procstate->times_considered; - break; - } - ++procstate->times_considered; - } - - if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall)) - procstate->set_done(); - - if (state->transition_.argument_ != -1 || start_count == 0) - req = &actor->simcall; - - break; - } - - case SIMCALL_COMM_WAIT: { - simgrid::mc::RemotePtr remote_act = - remote(static_cast(simcall_comm_wait__getraw__comm(&actor->simcall))); - simgrid::mc::Remote temp_act; - mc_model_checker->process().read(temp_act, remote_act); - simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer(); - if (act->src_actor_.get() && act->dst_actor_.get()) - state->transition_.argument_ = 0; // OK - else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY && - act->detached()) - state->transition_.argument_ = 0; // OK - else - state->transition_.argument_ = -1; // timeout - procstate->set_done(); - req = &actor->simcall; - break; - } - - case SIMCALL_MC_RANDOM: { - int min_value = simcall_mc_random__get__min(&actor->simcall); - state->transition_.argument_ = procstate->times_considered + min_value; - procstate->times_considered++; - if (state->transition_.argument_ == simcall_mc_random__get__max(&actor->simcall)) - procstate->set_done(); - req = &actor->simcall; - break; - } - - default: - procstate->set_done(); - state->transition_.argument_ = 0; - req = &actor->simcall; - break; + incomplete_comm_pattern_.clear(); + for (unsigned long i = 0; i < mcapi::get().get_maxpid(); i++) { + std::vector res; + for (auto const& comm : incomplete_communications_pattern[i]) + res.push_back(comm->dup()); + incomplete_comm_pattern_.push_back(std::move(res)); } - if (not req) - return nullptr; - - state->transition_.pid_ = actor->get_pid(); - state->executed_req_ = *req; - // Fetch the data of the request and translate it: - state->internal_req_ = *req; - - /* The waitany and testany request are transformed into a wait or test request over the corresponding communication - * action so it can be treated later by the dependence function. */ - switch (req->call_) { - case SIMCALL_COMM_WAITANY: { - state->internal_req_.call_ = SIMCALL_COMM_WAIT; - simgrid::kernel::activity::CommImpl* remote_comm; - remote_comm = mc_model_checker->process().read( - remote(simcall_comm_waitany__get__comms(req) + state->transition_.argument_)); - mc_model_checker->process().read(state->internal_comm_, remote(remote_comm)); - simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); - simcall_comm_wait__set__timeout(&state->internal_req_, 0); - break; - } - - case SIMCALL_COMM_TESTANY: - state->internal_req_.call_ = SIMCALL_COMM_TEST; - - if (state->transition_.argument_ > 0) { - simgrid::kernel::activity::CommImpl* remote_comm = mc_model_checker->process().read( - remote(simcall_comm_testany__get__comms(req) + state->transition_.argument_)); - mc_model_checker->process().read(state->internal_comm_, remote(remote_comm)); - } - - simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); - simcall_comm_test__set__result(&state->internal_req_, state->transition_.argument_); - break; - - case SIMCALL_COMM_WAIT: - mc_model_checker->process().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_), - remote(simcall_comm_wait__getraw__comm(req))); - simcall_comm_wait__set__comm(&state->executed_req_, state->internal_comm_.get_buffer()); - simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); - break; - - case SIMCALL_COMM_TEST: - mc_model_checker->process().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_), - remote(simcall_comm_test__getraw__comm(req))); - simcall_comm_test__set__comm(&state->executed_req_, state->internal_comm_.get_buffer()); - simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); - break; - - default: - /* No translation needed */ - break; - } - - return req; } -smx_simcall_t MC_state_choose_request(simgrid::mc::State* state) +void State::copy_index_comm_pattern() { - for (auto& actor : mc_model_checker->process().actors()) { - /* Only consider the actors that were marked as interleaving by the checker algorithm */ - if (not state->actor_states_[actor.copy.get_buffer()->get_pid()].is_todo()) - continue; + communication_indices_.clear(); + for (auto const& list_process_comm : initial_communications_pattern) + this->communication_indices_.push_back(list_process_comm.index_comm); +} - smx_simcall_t res = MC_state_choose_request_for_process(state, actor.copy.get_buffer()); - if (res) - return res; - } - return nullptr; +} }