-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2013. The SimGrid Team.
+ * All rights reserved. */
/* 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. */
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++;
- return state;
-}
-
-mc_state_t MC_state_pair_new(void)
-{
- mc_state_t state = NULL;
+ state->num = ++mc_stats->expanded_states;
- state = xbt_new0(s_mc_state_t, 1);
- state->max_pid = simix_process_maxpid;
- state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
-
- //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;
+ if(value != simcall_mc_random__get__max(req)){
+ 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;
smx_process_t process = NULL;
mc_procstate_t procstate = NULL;
unsigned int start_count;
+ smx_action_t act = NULL;
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_COMM_WAIT:
- if(simcall_comm_wait__get__comm(&process->simcall)->comm.src_proc
- && simcall_comm_wait__get__comm(&process->simcall)->comm.dst_proc){
+ act = simcall_comm_wait__get__comm(&process->simcall);
+ if(act->comm.src_proc && act->comm.dst_proc){
*value = 0;
}else{
- *value = -1;
+ if(act->comm.src_proc == NULL && act->comm.type == SIMIX_COMM_READY && act->comm.detached == 1)
+ *value = 0;
+ else
+ *value = -1;
}
procstate->state = MC_DONE;
return &process->simcall;
break;
+ case SIMCALL_MC_RANDOM:
+ if(procstate->state == MC_INTERLEAVE)
+ *value = 0;
+ else{
+ if(state->req_num < simcall_mc_random__get__max(&process->simcall))
+ *value = state->req_num + 1;
+ }
+ procstate->state = MC_DONE;
+ return &process->simcall;
+ break;
+
default:
procstate->state = MC_DONE;
*value = 0;