git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9460
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
if(SIMIX_process_is_enabled(process)){
switch(process->request.call){
case REQ_COMM_WAITANY:
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++)){
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;
+ *value = procstate->interleave_count-1;
+ break;
- procstate->state = MC_DONE;
+
+ if(procstate->interleave_count >= xbt_dynar_length(process->request.comm_waitany.comms))
+ procstate->state = MC_DONE;
+
+ if(*value != -1)
+ return &process->request;
+
break;
case REQ_COMM_TESTANY:
break;
case REQ_COMM_TESTANY:
if(MC_request_testany_fail(&process->request)){
procstate->state = MC_DONE;
if(MC_request_testany_fail(&process->request)){
procstate->state = MC_DONE;
return &process->request;
}
return &process->request;
}
- while(procstate->interleave_count < xbt_dynar_length(process->request.comm_waitany.comms)){
+ while(procstate->interleave_count < xbt_dynar_length(process->request.comm_testany.comms)){
if(SIMIX_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
*value = procstate->interleave_count - 1;
if(SIMIX_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
*value = procstate->interleave_count - 1;
- return &process->request;
- procstate->state = MC_DONE;
+
+ if(procstate->interleave_count >= xbt_dynar_length(process->request.comm_testany.comms))
+ procstate->state = MC_DONE;
+
+ if(*value != -1)
+ return &process->request;
+