void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value)
{
+ state->executed_req = *req;
+ state->req_num = value;
+
/* 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
* function. */
case REQ_COMM_WAIT:
state->internal_req = *req;
- state->internal_comm = *req->comm_wait.comm;
+ state->internal_comm = *(req->comm_wait.comm);
+ state->executed_req.comm_wait.comm = &state->internal_comm;
state->internal_req.comm_wait.comm = &state->internal_comm;
break;
case REQ_COMM_TEST:
state->internal_req = *req;
state->internal_comm = *req->comm_test.comm;
+ state->executed_req.comm_test.comm = &state->internal_comm;
state->internal_req.comm_test.comm = &state->internal_comm;
break;
state->internal_req = *req;
break;
}
-
- state->executed_req = *req;
- state->req_num = value;
}
smx_req_t MC_state_get_executed_request(mc_state_t state, int *value)
{
smx_process_t process = NULL;
mc_procstate_t procstate = NULL;
-
+ unsigned int start_count;
xbt_swag_foreach(process, simix_global->process_list){
procstate = &state->proc_status[process->pid];
if(procstate->state == MC_INTERLEAVE){
- if(SIMIX_process_is_enabled(process)){
+ if(MC_process_is_enabled(process)){
switch(process->request.call){
case REQ_COMM_WAITANY:
+ *value = -1;
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;
+ if(MC_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
+ *value = procstate->interleave_count-1;
+ break;
}
}
- procstate->state = MC_DONE;
- break;
- case REQ_COMM_TESTANY:
- if(MC_request_testany_fail(&process->request)){
+ if(procstate->interleave_count >= xbt_dynar_length(process->request.comm_waitany.comms))
procstate->state = MC_DONE;
- *value = -1;
+
+ if(*value != -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++)){
+ break;
+
+ case REQ_COMM_TESTANY:
+ start_count = procstate->interleave_count;
+ *value = -1;
+ while(procstate->interleave_count < xbt_dynar_length(process->request.comm_testany.comms)){
+ if(MC_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
*value = procstate->interleave_count - 1;
- return &process->request;
+ break;
}
}
+
+ if(procstate->interleave_count >= xbt_dynar_length(process->request.comm_testany.comms))
+ procstate->state = MC_DONE;
+
+ if(*value != -1 || start_count == 0)
+ return &process->request;
+
+ break;
+
+ case REQ_COMM_WAIT:
+ if(process->request.comm_wait.comm->comm.src_proc
+ && process->request.comm_wait.comm->comm.dst_proc){
+ *value = 0;
+ }else{
+ *value = -1;
+ }
procstate->state = MC_DONE;
+ return &process->request;
+
break;
default: