state->max_pid = simix_process_maxpid;
state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
state->system_state = NULL;
-
- mc_stats->expanded_states++;
+ state->num = ++mc_stats->expanded_states;
+
return state;
}
unsigned int i, size=0;
for(i=0; i < state->max_pid; i++){
- if(state->proc_status[i].state == MC_INTERLEAVE)
+ if((state->proc_status[i].state == MC_INTERLEAVE) || (state->proc_status[i].state == MC_MORE_INTERLEAVE))
size++;
}
{
state->executed_req = *req;
state->req_num = value;
+ smx_process_t process = NULL;
+ mc_procstate_t procstate = 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
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);
+ if(value == 0){
+ xbt_swag_foreach(process, simix_global->process_list){
+ procstate = &state->proc_status[process->pid];
+ if(process->pid == req->issuer->pid){
+ procstate->state = MC_MORE_INTERLEAVE;
+ break;
+ }
+ }
+ }
+ break;
+
default:
state->internal_req = *req;
break;
}
}
-
+
smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value)
{
*value = state->req_num;
xbt_swag_foreach(process, simix_global->process_list){
procstate = &state->proc_status[process->pid];
- if(procstate->state == MC_INTERLEAVE){
+ if(procstate->state == MC_INTERLEAVE || procstate->state == MC_MORE_INTERLEAVE){
if(MC_process_is_enabled(process)){
switch(process->simcall.call){
case SIMCALL_COMM_WAITANY:
break;
+ case SIMCALL_MC_RANDOM:
+ if(procstate->state == MC_INTERLEAVE)
+ *value = 0;
+ else
+ *value = 1;
+ procstate->state = MC_DONE;
+ return &process->simcall;
+ break;
+
default:
procstate->state = MC_DONE;
*value = 0;