X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..872d65264714799b25eb231609c3f05bae3d03dc:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 3611d8dcd5..771b348f20 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -6,18 +6,21 @@ #include -#include "../simix/smx_private.h" -#include "xbt/fifo.h" -#include "mc_state.h" -#include "mc_request.h" -#include "mc_private.h" -#include "mc_comm_pattern.h" -#include "mc_smx.h" -#include "mc_xbt.hpp" +#include -using simgrid::mc::remote; +#include +#include + +#include "src/simix/smx_private.h" +#include "src/mc/mc_state.h" +#include "src/mc/mc_request.h" +#include "src/mc/mc_private.h" +#include "src/mc/mc_comm_pattern.h" +#include "src/mc/mc_smx.h" +#include "src/mc/mc_xbt.hpp" +#include "src/mc/Transition.hpp" -extern "C" { +using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)"); @@ -25,19 +28,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, /** * \brief Creates a state data structure used by the exploration algorithm */ -mc_state_t MC_state_new() +simgrid::mc::State* MC_state_new(unsigned long state_number) { - mc_state_t state = xbt_new0(s_mc_state_t, 1); - - state->max_pid = MC_smx_get_maxpid(); - state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid); - state->system_state = NULL; - state->num = ++mc_stats->expanded_states; - state->in_visited_states = 0; - state->incomplete_comm_pattern = NULL; + simgrid::mc::State* state = new simgrid::mc::State(); + state->processStates.resize(MC_smx_get_maxpid()); + state->num = state_number; /* Stateful model checking */ - if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){ - state->system_state = MC_take_snapshot(state->num); + if((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination){ + state->system_state = simgrid::mc::take_snapshot(state->num); if(_sg_mc_comms_determinism || _sg_mc_send_determinism){ MC_state_copy_incomplete_communications_pattern(state); MC_state_copy_index_communications_pattern(state); @@ -46,64 +44,133 @@ mc_state_t MC_state_new() return state; } -/** - * \brief Deletes a state data structure - * \param trans The state to be deleted - */ -void MC_state_delete(mc_state_t state, int free_snapshot){ - if (state->system_state && free_snapshot){ - delete state->system_state; - } - if(_sg_mc_comms_determinism || _sg_mc_send_determinism){ - xbt_free(state->index_comm); - xbt_free(state->incomplete_comm_pattern); - } - xbt_free(state->proc_status); - xbt_free(state); +namespace simgrid { +namespace mc { + +State::State() +{ + std::memset(this->internal_comm.data(), 0, this->internal_comm.size()); + std::memset(&this->internal_req, 0, sizeof(this->internal_req)); + std::memset(&this->executed_req, 0, sizeof(this->executed_req)); } -void MC_state_interleave_process(mc_state_t state, smx_process_t process) +std::size_t State::interleaveSize() const { - assert(state); - state->proc_status[process->pid].state = MC_INTERLEAVE; - state->proc_status[process->pid].interleave_count = 0; + return std::count_if(this->processStates.begin(), this->processStates.end(), + [](simgrid::mc::ProcessState const& state) { return state.isToInterleave(); }); } -void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process) +Transition State::getTransition() const { - if (state->proc_status[process->pid].state == MC_INTERLEAVE) - state->proc_status[process->pid].state = MC_DONE; + return this->transition; +} + +} } -unsigned int MC_state_interleave_size(mc_state_t state) +static inline smx_simcall_t MC_state_get_request_for_process( + simgrid::mc::State* state, smx_process_t process) { - unsigned int i, size = 0; + simgrid::mc::ProcessState* procstate = &state->processStates[process->pid]; + state->transition.pid = -1; + state->transition.argument = -1; + + if (!procstate->isToInterleave()) + return nullptr; + if (!simgrid::mc::process_is_enabled(process)) + return nullptr; + + smx_simcall_t req = nullptr; + switch (process->simcall.call) { + case SIMCALL_COMM_WAITANY: + state->transition.argument = -1; + while (procstate->interleave_count < + 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; + break; + } + } + + if (procstate->interleave_count >= + simgrid::mc::read_length(mc_model_checker->process(), + simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall)))) + procstate->setDone(); + if (state->transition.argument != -1) + req = &process->simcall; + break; + + case SIMCALL_COMM_TESTANY: { + unsigned start_count = procstate->interleave_count; + state->transition.argument = -1; + while (procstate->interleave_count < + read_length(mc_model_checker->process(), + remote(simcall_comm_testany__get__comms(&process->simcall)))) + if (simgrid::mc::request_is_enabled_by_idx(&process->simcall, + procstate->interleave_count++)) { + state->transition.argument = procstate->interleave_count - 1; + break; + } + + if (procstate->interleave_count >= + read_length(mc_model_checker->process(), + remote(simcall_comm_testany__get__comms(&process->simcall)))) + procstate->setDone(); + + if (state->transition.argument != -1 || start_count == 0) + req = &process->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; + mc_model_checker->process().read(temp_act, remote_act); + simgrid::simix::Comm* act = static_cast(temp_act.data()); + if (act->src_proc && act->dst_proc) + state->transition.argument = 0; + else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY + && act->detached == 1) + state->transition.argument = 0; + else + state->transition.argument = -1; + procstate->setDone(); + req = &process->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)) + procstate->setDone(); + req = &process->simcall; + break; + } - for (i = 0; i < state->max_pid; i++) { - if ((state->proc_status[i].state == MC_INTERLEAVE) - || (state->proc_status[i].state == MC_MORE_INTERLEAVE)) - size++; + default: + procstate->setDone(); + state->transition.argument = 0; + req = &process->simcall; + break; } + if (!req) + return nullptr; - return size; -} + // Fetch the data of the request and translate it: -int MC_state_process_is_done(mc_state_t state, smx_process_t process) -{ - return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE; -} + state->transition.pid = process->pid; -void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, - int value) -{ state->executed_req = *req; - state->req_num = value; - - smx_process_t process = NULL; - /* 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. */ + /* 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; @@ -111,8 +178,9 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, smx_synchro_t remote_comm; read_element(mc_model_checker->process(), &remote_comm, remote(simcall_comm_waitany__get__comms(req)), - value, sizeof(remote_comm)); - mc_model_checker->process().read(&state->internal_comm, remote(remote_comm)); + 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); simcall_comm_wait__set__timeout(&state->internal_req, 0); break; @@ -122,16 +190,17 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, state->internal_req.call = SIMCALL_COMM_TEST; state->internal_req.issuer = req->issuer; - if (value > 0) { + if (state->transition.argument > 0) { smx_synchro_t remote_comm; read_element(mc_model_checker->process(), &remote_comm, remote(simcall_comm_testany__get__comms(req)), - value, sizeof(remote_comm)); - mc_model_checker->process().read(&state->internal_comm, remote(remote_comm)); + state->transition.argument, sizeof(remote_comm)); + mc_model_checker->process().read(state->internal_comm, remote( + static_cast(remote_comm))); } simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); - simcall_comm_test__set__result(&state->internal_req, value); + simcall_comm_test__set__result(&state->internal_req, state->transition.argument); break; case SIMCALL_COMM_WAIT: @@ -150,144 +219,20 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); break; - case SIMCALL_MC_RANDOM: { - state->internal_req = *req; - int random_max = simcall_mc_random__get__max(req); - if (value != random_max) { - MC_EACH_SIMIX_PROCESS(process, - mc_procstate_t procstate = &state->proc_status[process->pid]; - const smx_process_t issuer = MC_smx_simcall_get_issuer(req); - if (process->pid == issuer->pid) { - procstate->state = MC_MORE_INTERLEAVE; - break; - } - ); - } - break; - } - default: state->internal_req = *req; break; } -} -smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value) -{ - *value = state->req_num; - return &state->executed_req; + return req; } -smx_simcall_t MC_state_get_internal_request(mc_state_t state) +smx_simcall_t MC_state_get_request(simgrid::mc::State* state) { - return &state->internal_req; -} - -static inline smx_simcall_t MC_state_get_request_for_process( - mc_state_t state, int*value, smx_process_t process) -{ - mc_procstate_t procstate = &state->proc_status[process->pid]; - - if (procstate->state != MC_INTERLEAVE - && procstate->state != MC_MORE_INTERLEAVE) - return NULL; - if (!MC_process_is_enabled(process)) - return NULL; - - switch (process->simcall.call) { - - case SIMCALL_COMM_WAITANY: - *value = -1; - while (procstate->interleave_count < - read_length(mc_model_checker->process(), - remote(simcall_comm_waitany__get__comms(&process->simcall)))) { - if (MC_request_is_enabled_by_idx - (&process->simcall, procstate->interleave_count++)) { - *value = procstate->interleave_count - 1; - break; - } - } - - if (procstate->interleave_count >= - simgrid::mc::read_length(mc_model_checker->process(), - simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall)))) - procstate->state = MC_DONE; - - if (*value != -1) - return &process->simcall; - - break; - - case SIMCALL_COMM_TESTANY: { - unsigned start_count = procstate->interleave_count; - *value = -1; - while (procstate->interleave_count < - read_length(mc_model_checker->process(), - remote(simcall_comm_testany__get__comms(&process->simcall)))) { - if (MC_request_is_enabled_by_idx - (&process->simcall, procstate->interleave_count++)) { - *value = procstate->interleave_count - 1; - break; - } - } - - if (procstate->interleave_count >= - read_length(mc_model_checker->process(), - remote(simcall_comm_testany__get__comms(&process->simcall)))) - procstate->state = MC_DONE; - - if (*value != -1 || start_count == 0) - return &process->simcall; - - break; - } - - case SIMCALL_COMM_WAIT: { - smx_synchro_t remote_act = simcall_comm_wait__get__comm(&process->simcall); - s_smx_synchro_t act; - mc_model_checker->process().read_bytes( - &act, sizeof(act), remote(remote_act)); - if (act.comm.src_proc && act.comm.dst_proc) { - *value = 0; - } else { - if (act.comm.src_proc == NULL && act.comm.type == SIMIX_COMM_READY - && act.comm.detached == 1) - *value = 0; - else - *value = -1; - } - procstate->state = MC_DONE; - return &process->simcall; - } - - case SIMCALL_MC_RANDOM: - if (procstate->state == MC_INTERLEAVE) - *value = simcall_mc_random__get__min(&process->simcall); - else { - if (state->req_num < simcall_mc_random__get__max(&process->simcall)) - *value = state->req_num + 1; - } - procstate->state = MC_DONE; - return &process->simcall; - - default: - procstate->state = MC_DONE; - *value = 0; - return &process->simcall; - } - return NULL; -} - -smx_simcall_t MC_state_get_request(mc_state_t state, int *value) -{ - smx_process_t process = NULL; - MC_EACH_SIMIX_PROCESS(process, - smx_simcall_t res = MC_state_get_request_for_process(state, value, process); + for (auto& p : mc_model_checker->process().simix_processes()) { + smx_simcall_t res = MC_state_get_request_for_process(state, &p.copy); if (res) return res; - ); - - return NULL; -} - + } + return nullptr; }