X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3080c6b0d097d6b3b7d5b3dda0592154ce438f64..41626f8a47c96f54fa3b1ee61a90fb0af699dcbc:/src/mc/mc_state.c diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c index d48d10cd4d..2331919167 100644 --- a/src/mc/mc_state.c +++ b/src/mc/mc_state.c @@ -4,23 +4,36 @@ /* 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 "../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" /** * \brief Creates a state data structure used by the exploration algorithm */ mc_state_t MC_state_new() { - mc_state_t state = NULL; - - state = xbt_new0(s_mc_state_t, 1); - state->max_pid = simix_process_maxpid; + 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; + /* 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_comms_determinism || _sg_mc_send_determinism){ + MC_state_copy_incomplete_communications_pattern(state); + MC_state_copy_index_communications_pattern(state); + } + } return state; } @@ -28,16 +41,21 @@ mc_state_t MC_state_new() * \brief Deletes a state data structure * \param trans The state to be deleted */ -void MC_state_delete(mc_state_t state) -{ - if (state->system_state) +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); } void MC_state_interleave_process(mc_state_t state, smx_process_t process) { + assert(state); state->proc_status[process->pid].state = MC_INTERLEAVE; state->proc_status[process->pid].interleave_count = 0; } @@ -81,9 +99,9 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, case SIMCALL_COMM_WAITANY: state->internal_req.call = SIMCALL_COMM_WAIT; state->internal_req.issuer = req->issuer; - state->internal_comm = - *xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, - smx_action_t); + MC_process_read_dynar_element(&mc_model_checker->process, + &state->internal_comm, simcall_comm_waitany__get__comms(req), + sizeof(state->internal_comm)); simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm); simcall_comm_wait__set__timeout(&state->internal_req, 0); break; @@ -93,9 +111,10 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, state->internal_req.issuer = req->issuer; if (value > 0) - state->internal_comm = - *xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value, - smx_action_t); + // FIXME, read from remote process + MC_process_read_dynar_element(&mc_model_checker->process, + &state->internal_comm, simcall_comm_testany__get__comms(req), + sizeof(state->internal_comm)); simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); simcall_comm_test__set__result(&state->internal_req, value); @@ -103,28 +122,32 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, case SIMCALL_COMM_WAIT: state->internal_req = *req; - state->internal_comm = *(simcall_comm_wait__get__comm(req)); + MC_process_read_simple(&mc_model_checker->process, &state->internal_comm , + simcall_comm_wait__get__comm(req), sizeof(state->internal_comm)); 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; - state->internal_comm = *simcall_comm_test__get__comm(req); + MC_process_read_simple(&mc_model_checker->process, &state->internal_comm, + simcall_comm_test__get__comm(req), sizeof(state->internal_comm)); simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm); simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); break; case SIMCALL_MC_RANDOM: state->internal_req = *req; - if (value != simcall_mc_random__get__max(req)) { - xbt_swag_foreach(process, simix_global->process_list) { + int random_max = simcall_mc_random__get__max(req); + if (value != random_max) { + MC_EACH_SIMIX_PROCESS(process, procstate = &state->proc_status[process->pid]; - if (process->pid == req->issuer->pid) { + const smx_process_t issuer = MC_smx_simcall_get_issuer(req); + if (process->pid == issuer->pid) { procstate->state = MC_MORE_INTERLEAVE; break; } - } + ); } break; @@ -150,20 +173,23 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) smx_process_t process = NULL; mc_procstate_t procstate = NULL; unsigned int start_count; - smx_action_t act = NULL; + smx_synchro_t act = NULL; - xbt_swag_foreach(process, simix_global->process_list) { + MC_EACH_SIMIX_PROCESS(process, procstate = &state->proc_status[process->pid]; - if (procstate->state == MC_INTERLEAVE - || procstate->state == MC_MORE_INTERLEAVE) { - if (MC_process_is_enabled(process)) { - switch (process->simcall.call) { + if (procstate->state != MC_INTERLEAVE + && procstate->state != MC_MORE_INTERLEAVE) + continue; + if (!MC_process_is_enabled(process)) + continue; + + switch (process->simcall.call) { case SIMCALL_COMM_WAITANY: *value = -1; while (procstate->interleave_count < - xbt_dynar_length(simcall_comm_waitany__get__comms - (&process->simcall))) { + 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++)) { *value = procstate->interleave_count - 1; @@ -172,8 +198,8 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) } if (procstate->interleave_count >= - xbt_dynar_length(simcall_comm_waitany__get__comms - (&process->simcall))) + MC_process_read_dynar_length(&mc_model_checker->process, + simcall_comm_waitany__get__comms(&process->simcall))) procstate->state = MC_DONE; if (*value != -1) @@ -185,8 +211,8 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) start_count = procstate->interleave_count; *value = -1; while (procstate->interleave_count < - xbt_dynar_length(simcall_comm_testany__get__comms - (&process->simcall))) { + 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++)) { *value = procstate->interleave_count - 1; @@ -195,8 +221,8 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) } if (procstate->interleave_count >= - xbt_dynar_length(simcall_comm_testany__get__comms - (&process->simcall))) + MC_process_read_dynar_length(&mc_model_checker->process, + simcall_comm_testany__get__comms(&process->simcall))) procstate->state = MC_DONE; if (*value != -1 || start_count == 0) @@ -206,6 +232,7 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) case SIMCALL_COMM_WAIT: act = simcall_comm_wait__get__comm(&process->simcall); + if (act->comm.src_proc && act->comm.dst_proc) { *value = 0; } else { @@ -236,10 +263,9 @@ smx_simcall_t MC_state_get_request(mc_state_t state, int *value) *value = 0; return &process->simcall; break; - } - } + } - } + ); return NULL; }