From: cristianrosa <cristianrosa@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 20 Jan 2011 15:45:28 +0000 (+0000)
Subject: Bugfix: correctly set the process to MC_DONE once the last transition of it was execu... 
X-Git-Tag: v3.6_beta2~469
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/05005c62d2ccd390280fd15e20288f5e5c617273?ds=sidebyside

Bugfix: correctly set the process to MC_DONE once the last transition of it was executed (for waitany and testany).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9460 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index 8f88efe46f..5d6e506c30 100644
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -119,29 +119,42 @@ smx_req_t MC_state_get_request(mc_state_t state, int *value)
       if(SIMIX_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;
+                *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:
+            *value = -1;
             if(MC_request_testany_fail(&process->request)){
               procstate->state = MC_DONE;
-              *value = -1;
               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;
-                return &process->request;
+                break;
               }
             }
-            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;
+
             break;
 
           default: