#include "mc_comm_pattern.h"
#include "mc_smx.h"
-static void copy_incomplete_communications_pattern(mc_state_t state) {
- int i;
- xbt_dynar_t incomplete_process_comms;
- mc_comm_pattern_t comm;
- unsigned int cursor;
- state->incomplete_comm_pattern = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
- for (i=0; i<simix_process_maxpid; i++) {
- incomplete_process_comms = xbt_dynar_get_as(incomplete_communications_pattern, i, xbt_dynar_t);
- xbt_dynar_t incomplete_process_comms_copy = xbt_dynar_new(sizeof(mc_comm_pattern_t), comm_pattern_free_voidp);
- xbt_dynar_foreach(incomplete_process_comms, cursor, comm) {
- mc_comm_pattern_t copy_comm = xbt_new0(s_mc_comm_pattern_t, 1);
- copy_comm->index = comm->index;
- copy_comm->type = comm->type;
- copy_comm->comm = comm->comm;
- copy_comm->rdv = strdup(comm->rdv);
- copy_comm->data_size = -1;
- copy_comm->data = NULL;
- if(comm->type == SIMIX_COMM_SEND){
- copy_comm->src_proc = comm->src_proc;
- copy_comm->src_host = comm->src_host;
- if (comm->data != NULL) {
- copy_comm->data_size = comm->data_size;
- copy_comm->data = xbt_malloc0(comm->data_size);
- memcpy(copy_comm->data, comm->data, comm->data_size);
- }
- }else{
- copy_comm->dst_proc = comm->dst_proc;
- copy_comm->dst_host = comm->dst_host;
- }
- xbt_dynar_push(incomplete_process_comms_copy, ©_comm);
- }
- xbt_dynar_insert_at(state->incomplete_comm_pattern, i, &incomplete_process_comms_copy);
- }
-}
-
-static void copy_index_communications_pattern(mc_state_t state) {
-
- state->index_comm = xbt_dynar_new(sizeof(unsigned int), NULL);
- mc_list_comm_pattern_t list_process_comm;
- unsigned int cursor;
- xbt_dynar_foreach(initial_communications_pattern, cursor, list_process_comm){
- xbt_dynar_push_as(state->index_comm, unsigned int, list_process_comm->index_comm);
- }
-}
-
/**
* \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){
+ 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){
- copy_incomplete_communications_pattern(state);
- copy_index_communications_pattern(state);
+ MC_state_copy_incomplete_communications_pattern(state);
+ MC_state_copy_index_communications_pattern(state);
}
}
return state;
case SIMCALL_COMM_WAITANY:
state->internal_req.call = SIMCALL_COMM_WAIT;
state->internal_req.issuer = req->issuer;
- // FIXME, read from remote process
- state->internal_comm =
- *xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value,
- smx_synchro_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;
if (value > 0)
// FIXME, read from remote process
- state->internal_comm =
- *xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value,
- smx_synchro_t);
+ 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);
case SIMCALL_COMM_WAIT:
state->internal_req = *req;
- // FIXME, read from remote process
- 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;
- // FIXME, read from remote process
- 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;
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;
}
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)
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;
}
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)
case SIMCALL_COMM_WAIT:
act = simcall_comm_wait__get__comm(&process->simcall);
+
if (act->comm.src_proc && act->comm.dst_proc) {
*value = 0;
} else {
*value = 0;
return &process->simcall;
break;
- }
- }
+
}
);
