X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b99c0d78b25704a61225be8a8b5c47b246afe22a..12e01354e36033d37625d9675769d18058f7c1e7:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index e85574f899..94ef18847c 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -7,17 +7,17 @@ #include -#include -#include +#include "xbt/log.h" +#include "xbt/sysdep.h" -#include "src/simix/smx_private.h" -#include "src/mc/mc_state.h" -#include "src/mc/mc_request.h" +#include "src/mc/Transition.hpp" +#include "src/mc/mc_comm_pattern.hpp" #include "src/mc/mc_private.h" -#include "src/mc/mc_comm_pattern.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/mc/Transition.hpp" +#include "src/simix/smx_private.h" using simgrid::mc::remote; @@ -32,7 +32,7 @@ State::State(unsigned long state_number) std::memset(&this->internal_req, 0, sizeof(this->internal_req)); std::memset(&this->executed_req, 0, sizeof(this->executed_req)); - processStates.resize(MC_smx_get_maxpid()); + actorStates.resize(MC_smx_get_maxpid()); num = state_number; /* Stateful model checking */ if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) { @@ -46,8 +46,8 @@ State::State(unsigned long state_number) std::size_t State::interleaveSize() const { - return boost::range::count_if(this->processStates, - [](simgrid::mc::ProcessState const& p) { return p.isToInterleave(); }); + return boost::range::count_if(this->actorStates, + [](simgrid::mc::ProcessState const& p) { return p.isTodo(); }); } Transition State::getTransition() const @@ -63,7 +63,7 @@ Transition State::getTransition() const * 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 ProcessState (controled by the checker algo). + * - marked "to be interleaved" in their ProcessState (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. * @@ -72,68 +72,66 @@ Transition State::getTransition() const * field to remember what was the last returned sub-transition. */ static inline smx_simcall_t MC_state_get_request_for_process( - simgrid::mc::State* state, smx_actor_t process) + simgrid::mc::State* state, smx_actor_t actor) { /* reset the outgoing transition */ - simgrid::mc::ProcessState* procstate = &state->processStates[process->pid]; + simgrid::mc::ProcessState* procstate = &state->actorStates[actor->pid]; state->transition.pid = -1; state->transition.argument = -1; state->executed_req.call = SIMCALL_NONE; - if (!procstate->isToInterleave()) - return nullptr; - if (!simgrid::mc::actor_is_enabled(process)) - return nullptr; + if (not simgrid::mc::actor_is_enabled(actor)) + return nullptr; // Not executable in the application smx_simcall_t req = nullptr; - switch (process->simcall.call) { + switch (actor->simcall.call) { case SIMCALL_COMM_WAITANY: state->transition.argument = -1; - while (procstate->interleave_count < + while (procstate->times_considered < read_length(mc_model_checker->process(), - remote(simcall_comm_waitany__get__comms(&process->simcall)))) { - if (simgrid::mc::request_is_enabled_by_idx(&process->simcall, - procstate->interleave_count++)) { - state->transition.argument = procstate->interleave_count - 1; + 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; break; } } - if (procstate->interleave_count >= + if (procstate->times_considered >= simgrid::mc::read_length(mc_model_checker->process(), - simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall)))) + simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall)))) procstate->setDone(); if (state->transition.argument != -1) - req = &process->simcall; + req = &actor->simcall; break; case SIMCALL_COMM_TESTANY: { - unsigned start_count = procstate->interleave_count; + unsigned start_count = procstate->times_considered; state->transition.argument = -1; - while (procstate->interleave_count < - simcall_comm_testany__get__count(&process->simcall)) - if (simgrid::mc::request_is_enabled_by_idx(&process->simcall, - procstate->interleave_count++)) { - state->transition.argument = procstate->interleave_count - 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; break; } - if (procstate->interleave_count >= - simcall_comm_testany__get__count(&process->simcall)) + if (procstate->times_considered >= + simcall_comm_testany__get__count(&actor->simcall)) procstate->setDone(); if (state->transition.argument != -1 || start_count == 0) - req = &process->simcall; + req = &actor->simcall; break; } case SIMCALL_COMM_WAIT: { - simgrid::mc::RemotePtr remote_act = remote( - static_cast(simcall_comm_wait__get__comm(&process->simcall))); - simgrid::mc::Remote temp_act; + 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::Comm* act = temp_act.getBuffer(); + simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer(); if (act->src_proc && act->dst_proc) state->transition.argument = 0; else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY @@ -142,30 +140,30 @@ static inline smx_simcall_t MC_state_get_request_for_process( else state->transition.argument = -1; procstate->setDone(); - req = &process->simcall; + req = &actor->simcall; break; } case SIMCALL_MC_RANDOM: { - int min_value = simcall_mc_random__get__min(&process->simcall); - state->transition.argument = procstate->interleave_count + min_value; - procstate->interleave_count++; - if (state->transition.argument == simcall_mc_random__get__max(&process->simcall)) + 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->setDone(); - req = &process->simcall; + req = &actor->simcall; break; } default: procstate->setDone(); state->transition.argument = 0; - req = &process->simcall; + req = &actor->simcall; break; } - if (!req) + if (not req) return nullptr; - state->transition.pid = process->pid; + state->transition.pid = actor->pid; state->executed_req = *req; // Fetch the data of the request and translate it: state->internal_req = *req; @@ -176,12 +174,11 @@ static inline smx_simcall_t MC_state_get_request_for_process( switch (req->call) { case SIMCALL_COMM_WAITANY: { state->internal_req.call = SIMCALL_COMM_WAIT; - smx_activity_t remote_comm; - read_element(mc_model_checker->process(), - &remote_comm, remote(simcall_comm_waitany__get__comms(req)), - state->transition.argument, sizeof(remote_comm)); - mc_model_checker->process().read(state->internal_comm, remote( - static_cast(remote_comm))); + 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))); simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer()); simcall_comm_wait__set__timeout(&state->internal_req, 0); break; @@ -191,10 +188,10 @@ static inline smx_simcall_t MC_state_get_request_for_process( state->internal_req.call = SIMCALL_COMM_TEST; if (state->transition.argument > 0) { - smx_activity_t 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( - static_cast(remote_comm))); + 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))); } simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer()); @@ -202,15 +199,15 @@ static inline smx_simcall_t MC_state_get_request_for_process( break; case SIMCALL_COMM_WAIT: - mc_model_checker->process().read_bytes(&state->internal_comm , - sizeof(state->internal_comm), remote(simcall_comm_wait__get__comm(req))); + 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.getBuffer()); simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer()); break; case SIMCALL_COMM_TEST: - mc_model_checker->process().read_bytes(&state->internal_comm, - sizeof(state->internal_comm), remote(simcall_comm_test__get__comm(req))); + 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.getBuffer()); simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer()); break; @@ -226,6 +223,10 @@ static inline smx_simcall_t MC_state_get_request_for_process( 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()) + continue; + smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.getBuffer()); if (res) return res;