X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ebcb91551aa801d2353d854ffe9c1d1bf72d7db9..4bcfd40036f842e976d329cd0cee7349b8e0f4d6:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 0bce019d43..7f8fa6be14 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -1,24 +1,15 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2019. 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 +#include "src/mc/mc_comm_pattern.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_state.hpp" #include -#include "xbt/log.h" -#include "xbt/sysdep.h" - -#include "src/mc/Transition.hpp" -#include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_private.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_state.h" -#include "src/mc/mc_xbt.hpp" -#include "src/simix/smx_private.h" - using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)"); @@ -71,7 +62,7 @@ Transition State::getTransition() const static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor) { /* reset the outgoing transition */ - simgrid::mc::ProcessState* procstate = &state->actorStates[actor->pid]; + simgrid::mc::ProcessState* procstate = &state->actorStates[actor->get_pid()]; state->transition.pid = -1; state->transition.argument = -1; state->executed_req.call = SIMCALL_NONE; @@ -83,17 +74,16 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* switch (actor->simcall.call) { case SIMCALL_COMM_WAITANY: state->transition.argument = -1; - while (procstate->times_considered < - read_length(mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(&actor->simcall)))) { - if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) { - state->transition.argument = procstate->times_considered - 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 >= - simgrid::mc::read_length(mc_model_checker->process(), - simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall)))) + if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall)) procstate->setDone(); if (state->transition.argument != -1) req = &actor->simcall; @@ -102,11 +92,14 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* 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 - 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->setDone(); @@ -123,9 +116,10 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* simgrid::mc::Remote temp_act; mc_model_checker->process().read(temp_act, remote_act); simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer(); - if (act->src_proc && act->dst_proc) + if (act->src_actor_.get() && act->dst_actor_.get()) state->transition.argument = 0; - else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY && act->detached == 1) + else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY && + act->detached()) state->transition.argument = 0; else state->transition.argument = -1; @@ -153,7 +147,7 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* if (not req) return nullptr; - state->transition.pid = actor->pid; + state->transition.pid = actor->get_pid(); state->executed_req = *req; // Fetch the data of the request and translate it: state->internal_req = *req; @@ -163,11 +157,10 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* switch (req->call) { case SIMCALL_COMM_WAITANY: { state->internal_req.call = SIMCALL_COMM_WAIT; - simgrid::kernel::activity::ActivityImpl* remote_comm; - read_element(mc_model_checker->process(), &remote_comm, remote(simcall_comm_waitany__getraw__comms(req)), - state->transition.argument, sizeof(remote_comm)); - mc_model_checker->process().read(state->internal_comm, - remote(static_cast(remote_comm))); + 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.getBuffer()); simcall_comm_wait__set__timeout(&state->internal_req, 0); break; @@ -177,10 +170,9 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state->internal_req.call = SIMCALL_COMM_TEST; if (state->transition.argument > 0) { - simgrid::kernel::activity::ActivityImpl* remote_comm = mc_model_checker->process().read( - remote(simcall_comm_testany__getraw__comms(req) + state->transition.argument)); - mc_model_checker->process().read(state->internal_comm, - remote(static_cast(remote_comm))); + 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.getBuffer()); @@ -213,7 +205,7 @@ smx_simcall_t MC_state_get_request(simgrid::mc::State* state) { for (auto& actor : mc_model_checker->process().actors()) { /* Only consider the actors that were marked as interleaving by the checker algorithm */ - if (not state->actorStates[actor.copy.getBuffer()->pid].isTodo()) + if (not state->actorStates[actor.copy.getBuffer()->get_pid()].isTodo()) continue; smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.getBuffer());