X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc0b836b646303e8a540d20d9e86ecd4049bb372..4b95f054f8e620b68676f19b9db38002889538c6:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 510a7dee23..a3420467a6 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -6,9 +6,10 @@ #include +#include + #include #include -#include #include "src/simix/smx_private.h" #include "src/mc/mc_state.h" @@ -20,24 +21,17 @@ using simgrid::mc::remote; -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)"); /** * \brief Creates a state data structure used by the exploration algorithm */ -mc_state_t MC_state_new() +simgrid::mc::State* MC_state_new() { - 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 = nullptr; + simgrid::mc::State* state = new simgrid::mc::State(); + state->processStates.resize(MC_smx_get_maxpid()); state->num = ++mc_stats->expanded_states; - state->in_visited_states = 0; - state->incomplete_comm_pattern = nullptr; /* Stateful model checking */ if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){ state->system_state = simgrid::mc::take_snapshot(state->num); @@ -49,50 +43,39 @@ 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 { -void MC_state_interleave_process(mc_state_t state, smx_process_t process) +State::State() { - assert(state); - state->proc_status[process->pid].state = MC_INTERLEAVE; - state->proc_status[process->pid].interleave_count = 0; + std::memset(&this->internal_comm, 0, sizeof(this->internal_comm)); + std::memset(&this->internal_req, 0, sizeof(this->internal_req)); + std::memset(&this->executed_req, 0, sizeof(this->executed_req)); } -void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process) +std::size_t State::interleaveSize() const { - if (state->proc_status[process->pid].state == MC_INTERLEAVE) - state->proc_status[process->pid].state = MC_DONE; + return std::count_if(this->processStates.begin(), this->processStates.end(), + [](simgrid::mc::ProcessState const& state) { return state.interleave(); }); } -unsigned int MC_state_interleave_size(mc_state_t state) +} +} + +void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process) { - unsigned int i, size = 0; - 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++; - return size; + assert(state); + state->processStates[process->pid].state = simgrid::mc::ProcessInterleaveState::interleave; + state->processStates[process->pid].interleave_count = 0; } -int MC_state_process_is_done(mc_state_t state, smx_process_t process) +void MC_state_remove_interleave_process(simgrid::mc::State* state, smx_process_t process) { - return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE; + if (state->processStates[process->pid].state == simgrid::mc::ProcessInterleaveState::interleave) + state->processStates[process->pid].state = simgrid::mc::ProcessInterleaveState::done; } -void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, +void MC_state_set_executed_request(simgrid::mc::State* state, smx_simcall_t req, int value) { state->executed_req = *req; @@ -152,10 +135,10 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int random_max = simcall_mc_random__get__max(req); if (value != random_max) for (auto& p : mc_model_checker->process().simix_processes()) { - mc_procstate_t procstate = &state->proc_status[p.copy.pid]; + simgrid::mc::ProcessState* procstate = &state->processStates[p.copy.pid]; const smx_process_t issuer = MC_smx_simcall_get_issuer(req); if (p.copy.pid == issuer->pid) { - procstate->state = MC_MORE_INTERLEAVE; + procstate->state = simgrid::mc::ProcessInterleaveState::more_interleave; break; } } @@ -168,25 +151,24 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, } } -smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value) +smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value) { *value = state->req_num; return &state->executed_req; } -smx_simcall_t MC_state_get_internal_request(mc_state_t state) +smx_simcall_t MC_state_get_internal_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) + simgrid::mc::State* state, int*value, smx_process_t process) { - mc_procstate_t procstate = &state->proc_status[process->pid]; + simgrid::mc::ProcessState* procstate = &state->processStates[process->pid]; - if (procstate->state != MC_INTERLEAVE - && procstate->state != MC_MORE_INTERLEAVE) - return nullptr; + if (!procstate->interleave()) + return nullptr; if (!simgrid::mc::process_is_enabled(process)) return nullptr; @@ -207,7 +189,7 @@ static inline smx_simcall_t MC_state_get_request_for_process( 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; + procstate->state = simgrid::mc::ProcessInterleaveState::done; if (*value != -1) return &process->simcall; @@ -229,7 +211,7 @@ static inline smx_simcall_t MC_state_get_request_for_process( if (procstate->interleave_count >= read_length(mc_model_checker->process(), remote(simcall_comm_testany__get__comms(&process->simcall)))) - procstate->state = MC_DONE; + procstate->state = simgrid::mc::ProcessInterleaveState::done; if (*value != -1 || start_count == 0) return &process->simcall; @@ -249,27 +231,27 @@ static inline smx_simcall_t MC_state_get_request_for_process( *value = 0; else *value = -1; - procstate->state = MC_DONE; + procstate->state = simgrid::mc::ProcessInterleaveState::done; return &process->simcall; } case SIMCALL_MC_RANDOM: - if (procstate->state == MC_INTERLEAVE) + if (procstate->state == simgrid::mc::ProcessInterleaveState::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; + procstate->state = simgrid::mc::ProcessInterleaveState::done; return &process->simcall; default: - procstate->state = MC_DONE; + procstate->state = simgrid::mc::ProcessInterleaveState::done; *value = 0; return &process->simcall; } return nullptr; } -smx_simcall_t MC_state_get_request(mc_state_t state, int *value) +smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value) { for (auto& p : mc_model_checker->process().simix_processes()) { smx_simcall_t res = MC_state_get_request_for_process(state, value, &p.copy); @@ -278,5 +260,3 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) } return nullptr; } - -}