*/
void MC_state_delete(mc_state_t state)
{
+ if(state->system_state)
+ MC_free_snapshot(state->system_state);
xbt_free(state->proc_status);
xbt_free(state);
}
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);
- simcall_comm_wait__set__comm(&state->internal_req, xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t));
+ simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
simcall_comm_wait__set__timeout(&state->internal_req, 0);
break;
if(value > 0)
state->internal_comm = *xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value, smx_action_t);
- simcall_comm_test__set__comm(&state->internal_req, xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value, smx_action_t));
+ simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
simcall_comm_test__set__result(&state->internal_req, value);
break;
case SIMCALL_COMM_WAIT:
state->internal_req = *req;
state->internal_comm = *(simcall_comm_wait__get__comm(req));
- simcall_comm_wait__set__comm(&state->executed_req, simcall_comm_wait__get__comm(req));
- simcall_comm_wait__set__comm(&state->internal_req, 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;
state->internal_comm = *simcall_comm_test__get__comm(req);
- simcall_comm_test__set__comm(&state->executed_req, simcall_comm_test__get__comm(req));
- simcall_comm_test__set__comm(&state->internal_req, 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;
+
+ case SIMCALL_MC_RANDOM:
+ state->internal_req = *req;
+ simcall_mc_random__set__result(&state->internal_req, value);
break;
default:
smx_process_t process = NULL;
mc_procstate_t procstate = NULL;
unsigned int start_count;
+ int min, max;
+
+ static int first = 0;
+ if(first == 0){
+ srand(987654321);
+ first = 1;
+ }
xbt_swag_foreach(process, simix_global->process_list){
procstate = &state->proc_status[process->pid];
break;
+ case SIMCALL_MC_RANDOM:
+ min = simcall_mc_random__get__min(&process->simcall);
+ max = simcall_mc_random__get__max(&process->simcall);
+ *value = (int)((rand() % ((max-min)+1)) + min);
+ procstate->state = MC_DONE;
+ return &process->simcall;
+ break;
+
default:
procstate->state = MC_DONE;
*value = 0;