/* 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 <assert.h>
+
#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"
static void copy_incomplete_communications_pattern(mc_state_t state) {
int i;
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);
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;
}
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);
state->internal_req.issuer = req->issuer;
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);
case SIMCALL_COMM_WAIT:
state->internal_req = *req;
+ // FIXME, read from remote process
state->internal_comm = *(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);
case SIMCALL_COMM_TEST:
state->internal_req = *req;
+ // FIXME, read from remote process
state->internal_comm = *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);
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;
unsigned int start_count;
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 <
*value = 0;
return &process->simcall;
break;
- }
- }
+
}
- }
+ );
return NULL;
}