X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..4b95f054f8e620b68676f19b9db38002889538c6:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 0ebde42a8b..a3420467a6 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,15 +6,20 @@ #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 -extern "C" { +#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" + +using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)"); @@ -22,19 +27,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() { - 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; + 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 = NULL; /* 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); + 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); @@ -43,83 +43,72 @@ 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){ - MC_free_snapshot(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) -{ - 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; +void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process) +{ + 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; 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. */ switch (req->call) { - case SIMCALL_COMM_WAITANY: + case SIMCALL_COMM_WAITANY: { state->internal_req.call = SIMCALL_COMM_WAIT; state->internal_req.issuer = req->issuer; - MC_process_read_dynar_element(&mc_model_checker->process(), - &state->internal_comm, simcall_comm_waitany__get__comms(req), - value, sizeof(state->internal_comm)); + 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)); simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm); simcall_comm_wait__set__timeout(&state->internal_req, 0); break; + } case SIMCALL_COMM_TESTANY: state->internal_req.call = SIMCALL_COMM_TEST; state->internal_req.issuer = req->issuer; - if (value > 0) - MC_process_read_dynar_element(&mc_model_checker->process(), - &state->internal_comm, simcall_comm_testany__get__comms(req), - value, sizeof(state->internal_comm)); + if (value > 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)); + } simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); simcall_comm_test__set__result(&state->internal_req, value); @@ -127,16 +116,16 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, case SIMCALL_COMM_WAIT: state->internal_req = *req; - MC_process_read_simple(&mc_model_checker->process(), &state->internal_comm , - simcall_comm_wait__get__comm(req), sizeof(state->internal_comm)); + mc_model_checker->process().read_bytes(&state->internal_comm , + sizeof(state->internal_comm), remote(simcall_comm_wait__get__comm(req))); simcall_comm_wait__set__comm(&state->executed_req, &state->internal_comm); simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm); break; case SIMCALL_COMM_TEST: state->internal_req = *req; - MC_process_read_simple(&mc_model_checker->process(), &state->internal_comm, - simcall_comm_test__get__comm(req), sizeof(state->internal_comm)); + mc_model_checker->process().read_bytes(&state->internal_comm, + sizeof(state->internal_comm), remote(simcall_comm_test__get__comm(req))); simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm); simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); break; @@ -144,16 +133,15 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, 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]; + if (value != random_max) + for (auto& p : mc_model_checker->process().simix_processes()) { + simgrid::mc::ProcessState* procstate = &state->processStates[p.copy.pid]; const smx_process_t issuer = MC_smx_simcall_get_issuer(req); - if (process->pid == issuer->pid) { - procstate->state = MC_MORE_INTERLEAVE; + if (p.copy.pid == issuer->pid) { + procstate->state = simgrid::mc::ProcessInterleaveState::more_interleave; break; } - ); - } + } break; } @@ -163,46 +151,45 @@ 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 NULL; - if (!MC_process_is_enabled(process)) - return NULL; + if (!procstate->interleave()) + return nullptr; + if (!simgrid::mc::process_is_enabled(process)) + return nullptr; switch (process->simcall.call) { case SIMCALL_COMM_WAITANY: *value = -1; while (procstate->interleave_count < - MC_process_read_dynar_length(&mc_model_checker->process(), - simcall_comm_waitany__get__comms(&process->simcall))) { - if (MC_request_is_enabled_by_idx - (&process->simcall, 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++)) { *value = procstate->interleave_count - 1; break; } } if (procstate->interleave_count >= - MC_process_read_dynar_length(&mc_model_checker->process(), - simcall_comm_waitany__get__comms(&process->simcall))) - procstate->state = MC_DONE; + simgrid::mc::read_length(mc_model_checker->process(), + simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall)))) + procstate->state = simgrid::mc::ProcessInterleaveState::done; if (*value != -1) return &process->simcall; @@ -213,19 +200,18 @@ static inline smx_simcall_t MC_state_get_request_for_process( unsigned start_count = procstate->interleave_count; *value = -1; while (procstate->interleave_count < - MC_process_read_dynar_length(&mc_model_checker->process(), - simcall_comm_testany__get__comms(&process->simcall))) { - if (MC_request_is_enabled_by_idx - (&process->simcall, 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++)) { *value = procstate->interleave_count - 1; break; } - } if (procstate->interleave_count >= - MC_process_read_dynar_length(&mc_model_checker->process(), - simcall_comm_testany__get__comms(&process->simcall))) - procstate->state = MC_DONE; + read_length(mc_model_checker->process(), + remote(simcall_comm_testany__get__comms(&process->simcall)))) + procstate->state = simgrid::mc::ProcessInterleaveState::done; if (*value != -1 || start_count == 0) return &process->simcall; @@ -236,49 +222,41 @@ static inline smx_simcall_t MC_state_get_request_for_process( case SIMCALL_COMM_WAIT: { smx_synchro_t remote_act = simcall_comm_wait__get__comm(&process->simcall); s_smx_synchro_t act; - MC_process_read_simple(&mc_model_checker->process(), - &act, remote_act, sizeof(act)); - if (act.comm.src_proc && act.comm.dst_proc) { + 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 + else if (act.comm.src_proc == nullptr && act.comm.type == SIMIX_COMM_READY && act.comm.detached == 1) - *value = 0; - else - *value = -1; - } - procstate->state = MC_DONE; + *value = 0; + else + *value = -1; + 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; + else if (state->req_num < simcall_mc_random__get__max(&process->simcall)) + *value = state->req_num + 1; + 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 NULL; + 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) { - 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, value, &p.copy); if (res) return res; - ); - - return NULL; -} - + } + return nullptr; }