#include "xbt/fifo.h"
#include "private.h"
-static void MC_state_add_transition(mc_state_t state, mc_transition_t trans);
-
/**
* \brief Creates a state data structure used by the exploration algorithm
*/
xbt_free(state);
}
-void MC_state_add_to_interleave(mc_state_t state, smx_process_t process)
+void MC_state_interleave_process(mc_state_t state, smx_process_t process)
{
state->proc_status[process->pid].state = MC_INTERLEAVE;
- state->proc_status[process->pid].num_to_interleave = 1;
+ state->proc_status[process->pid].interleave_count = 0;
}
unsigned int MC_state_interleave_size(mc_state_t state)
return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE;
}
-void MC_state_set_executed_request(mc_state_t state, smx_req_t req)
+void MC_state_set_executed_request(mc_state_t state, smx_req_t req, unsigned int value)
{
+ state->executed_value = value;
state->executed = *req;
}
-smx_req_t MC_state_get_executed_request(mc_state_t state)
+smx_req_t MC_state_get_executed_request(mc_state_t state, unsigned int *value)
{
+ *value = state->executed_value;
return &state->executed;
}
-smx_req_t MC_state_get_request(mc_state_t state, char *value)
+smx_req_t MC_state_get_request(mc_state_t state, unsigned int *value)
{
- unsigned int i;
smx_process_t process = NULL;
mc_procstate_t procstate = NULL;
- for(i=0; i < state->max_pid; i++){
- procstate = &state->proc_status[i];
-
- if(procstate->state == MC_INTERLEAVE){
- if(procstate->num_to_interleave-- > 1)
- *value = procstate->requests_indexes[procstate->num_to_interleave];
+ xbt_swag_foreach(process, simix_global->process_list){
+ procstate = &state->proc_status[process->pid];
- /* If the are no more requests to interleave for process i then it is done */
- if(procstate->num_to_interleave == 0)
- procstate->state = MC_DONE;
-
- /* FIXME: SIMIX should implement a process table indexed by pid */
- /* So we should use that instead of traversing the swag */
- xbt_swag_foreach(process, simix_global->process_list){
- if(process->pid == i)
- break;
+ if(procstate->state == MC_INTERLEAVE){
+ if(SIMIX_process_is_enabled(process)){
+ switch(process->request.call){
+ case REQ_COMM_WAITANY:
+ while(procstate->interleave_count < xbt_dynar_length(process->request.comm_waitany.comms)){
+ if(SIMIX_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
+ *value = procstate->interleave_count - 1;
+ return &process->request;
+ }
+ }
+ procstate->state = MC_DONE;
+ break;
+
+ case REQ_COMM_TESTANY:
+ if(MC_request_testany_fail(&process->request)){
+ procstate->state = MC_DONE;
+ *value = (unsigned int)-1;
+ return &process->request;
+ }
+
+ while(procstate->interleave_count < xbt_dynar_length(process->request.comm_waitany.comms)){
+ if(SIMIX_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
+ *value = procstate->interleave_count - 1;
+ return &process->request;
+ }
+ }
+ procstate->state = MC_DONE;
+ break;
+
+ default:
+ procstate->state = MC_DONE;
+ *value = 0;
+ return &process->request;
+ break;
+ }
}
-
- if(SIMIX_process_is_enabled(process))
- return &process->request;
}
}