X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b91248fa5fef0d3a11b9da3546cf9f1023192a..44d361c91bd348cd70ee6afbdf63a5c2a7406dc1:/src/mc/mc_request.c

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index ac8840e521..970800c5d5 100644
--- a/src/mc/mc_request.c
+++ b/src/mc/mc_request.c
@@ -2,6 +2,9 @@
 
 int MC_request_depend(smx_req_t r1, smx_req_t r2)
 {
+  if(_surf_do_model_check == 2)
+    return TRUE;
+
   if (r1->issuer == r2->issuer)
     return FALSE;
 
@@ -11,21 +14,54 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2)
   if(r1->call == REQ_COMM_IRECV && r2->call == REQ_COMM_ISEND)
     return FALSE;
 
+  if(   (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV)
+       &&  r2->call == REQ_COMM_WAIT){
+
+    if(r2->comm_wait.comm->comm.rdv == NULL)
+      return FALSE;
+
+    smx_rdv_t rdv = r1->call == REQ_COMM_ISEND ? r1->comm_isend.rdv : r1->comm_irecv.rdv;
+
+    if(r2->comm_wait.comm->comm.rdv != rdv)
+      return FALSE;
+
+    if(r2->comm_wait.comm->type == SIMIX_COMM_SEND && r1->call == REQ_COMM_ISEND)
+      return FALSE;
+
+    if(r2->comm_wait.comm->type == SIMIX_COMM_RECEIVE && r1->call == REQ_COMM_IRECV)
+      return FALSE;
+  }
+
+  if(   (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV)
+       &&  r1->call == REQ_COMM_WAIT){
+
+    if(r1->comm_wait.comm->comm.rdv != NULL)
+      return FALSE;
+
+    smx_rdv_t rdv = r2->call == REQ_COMM_ISEND ? r2->comm_isend.rdv : r2->comm_irecv.rdv;
+
+    if(r1->comm_wait.comm->comm.rdv != rdv)
+      return FALSE;
+
+    if(r1->comm_wait.comm->type == SIMIX_COMM_SEND && r2->call == REQ_COMM_ISEND)
+      return FALSE;
+
+    if(r1->comm_wait.comm->type == SIMIX_COMM_RECEIVE && r2->call == REQ_COMM_IRECV)
+      return FALSE;
+  }
+
   /* FIXME: the following rule assumes that the result of the
    * isend/irecv call is not stored in a buffer used in the
-   * wait/test call. */
+   * test call. */
   if(   (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV)
-     && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST))
+     &&  r2->call == REQ_COMM_TEST)
     return FALSE;
 
   /* FIXME: the following rule assumes that the result of the
    * isend/irecv call is not stored in a buffer used in the
-   * wait/test call. */
+   * test call.*/
   if(   (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV)
-     && (r1->call == REQ_COMM_WAIT || r1->call == REQ_COMM_TEST))
-    return FALSE;
-
-  if(r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_IRECV)
+     && r1->call == REQ_COMM_TEST)
     return FALSE;
 
   if(r1->call == REQ_COMM_ISEND && r2->call == REQ_COMM_ISEND
@@ -36,6 +72,16 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2)
       && r1->comm_irecv.rdv != r2->comm_irecv.rdv)
     return FALSE;
 
+  if(r1->call == REQ_COMM_WAIT && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST)
+     && (r1->comm_wait.comm->comm.src_proc == NULL
+         || r1->comm_wait.comm->comm.dst_proc == NULL))
+    return FALSE;
+
+  if(r2->call == REQ_COMM_WAIT && (r1->call == REQ_COMM_WAIT || r1->call == REQ_COMM_TEST)
+     && (r2->comm_wait.comm->comm.src_proc == NULL
+         || r2->comm_wait.comm->comm.dst_proc == NULL))
+    return FALSE;
+
   if(r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_WAIT
       && r1->comm_wait.comm->comm.src_buff == r2->comm_wait.comm->comm.src_buff
       && r1->comm_wait.comm->comm.dst_buff == r2->comm_wait.comm->comm.dst_buff)
@@ -73,10 +119,30 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2)
       && r1->comm_wait.comm->comm.dst_buff == r2->comm_test.comm->comm.dst_buff)
     return FALSE;
 
+  if (r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_TEST
+        && r1->comm_wait.comm->comm.src_buff != NULL
+        && r1->comm_wait.comm->comm.dst_buff != NULL
+        && r2->comm_test.comm->comm.src_buff != NULL
+        && r2->comm_test.comm->comm.dst_buff != NULL
+        && r1->comm_wait.comm->comm.dst_buff != r2->comm_test.comm->comm.src_buff
+        && r1->comm_wait.comm->comm.dst_buff != r2->comm_test.comm->comm.dst_buff
+        && r2->comm_test.comm->comm.dst_buff != r1->comm_wait.comm->comm.src_buff)
+    return FALSE;
+
+  if (r1->call == REQ_COMM_TEST && r2->call == REQ_COMM_WAIT
+          && r1->comm_test.comm->comm.src_buff != NULL
+          && r1->comm_test.comm->comm.dst_buff != NULL
+          && r2->comm_wait.comm->comm.src_buff != NULL
+          && r2->comm_wait.comm->comm.dst_buff != NULL
+          && r1->comm_test.comm->comm.dst_buff != r2->comm_wait.comm->comm.src_buff
+          && r1->comm_test.comm->comm.dst_buff != r2->comm_wait.comm->comm.dst_buff
+          && r2->comm_wait.comm->comm.dst_buff != r1->comm_test.comm->comm.src_buff)
+      return FALSE;
+
   return TRUE;
 }
 
-char *MC_request_to_string(smx_req_t req)
+char *MC_request_to_string(smx_req_t req, int value)
 {
   char *type = NULL, *args = NULL, *str = NULL; 
   smx_action_t act = NULL;
@@ -96,32 +162,48 @@ char *MC_request_to_string(smx_req_t req)
       break;
     case REQ_COMM_WAIT:
       act = req->comm_wait.comm;
-      type = bprintf("Wait");
-      args  = bprintf("%p [%s(%lu) -> %s(%lu)]", act,
-                      act->comm.src_proc ? act->comm.src_proc->name : "",
-                      act->comm.src_proc ? act->comm.src_proc->pid : 0,
-                      act->comm.dst_proc ? act->comm.dst_proc->name : "",
-                      act->comm.dst_proc ? act->comm.dst_proc->pid : 0);
+      if(value == -1){
+        type = bprintf("WaitTimeout");
+        args = bprintf("comm=%p", act);
+      }else{
+        type = bprintf("Wait");
+        args  = bprintf("comm=%p [(%lu)%s -> (%lu)%s]", act,
+                        act->comm.src_proc ? act->comm.src_proc->pid : 0,
+                        act->comm.src_proc ? act->comm.src_proc->name : "",
+                        act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
+                        act->comm.dst_proc ? act->comm.dst_proc->name : "");
+      }
       break;
     case REQ_COMM_TEST:
       act = req->comm_test.comm;
-      type = bprintf("Test");
-      args  = bprintf("%p [%s -> %s]", act, 
-                      act->comm.src_proc ? act->comm.src_proc->name : "",
-                      act->comm.dst_proc ? act->comm.dst_proc->name : "");
+      if(act->comm.src_proc == NULL || act->comm.src_proc == NULL){
+        type = bprintf("Test FALSE");
+        args = bprintf("comm=%p", act);
+      }else{
+        type = bprintf("Test TRUE");
+        args  = bprintf("comm=%p [(%lu)%s -> (%lu)%s]", act,
+                          act->comm.src_proc ? act->comm.src_proc->pid : 0,
+                          act->comm.src_proc ? act->comm.src_proc->name : "",
+                          act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
+                          act->comm.dst_proc ? act->comm.dst_proc->name : "");
+      }
       break;
 
     case REQ_COMM_WAITANY:
       type = bprintf("WaitAny");
-      args = bprintf("-");
-      /* FIXME: improve output */
+      args = bprintf("comm=%p (%d of %lu)", xbt_dynar_get_as(req->comm_waitany.comms, value, smx_action_t),
+                     value+1, xbt_dynar_length(req->comm_waitany.comms));
       break;
 
     case REQ_COMM_TESTANY:
-       type = bprintf("TestAny");
-       args = bprintf("-");
-       /* FIXME: improve output */
-       break;
+      if(value == -1){
+        type = bprintf("TestAny FALSE");
+        args = bprintf("-");
+      }else{
+        type = bprintf("TestAny");
+        args = bprintf("(%d of %lu)", value+1, xbt_dynar_length(req->comm_testany.comms));
+      }
+      break;
 
     default:
       THROW_UNIMPLEMENTED;
@@ -166,17 +248,19 @@ int MC_request_is_enabled(smx_req_t req)
     case REQ_COMM_WAIT:
       /* FIXME: check also that src and dst processes are not suspended */
 
-      /* If there is a timeout it will be always enabled because, if the
-       * communication is not ready, it can timeout.
-       * This avoids false positives on dead-locks */
-      if(req->comm_wait.timeout >= 0)
+      /* If it has a timeout it will be always be enabled, because even if the
+       * communication is not ready, it can timeout and won't block.
+       * On the other hand if it hasn't a timeout, check if the comm is ready.*/
+      if(req->comm_wait.timeout >= 0){
         return TRUE;
-
-      act = req->comm_wait.comm;
-      return (act->comm.src_proc && act->comm.dst_proc);
+      }else{
+        act = req->comm_wait.comm;
+        return (act->comm.src_proc && act->comm.dst_proc);
+      }
       break;
 
     case REQ_COMM_WAITANY:
+      /* Check if it has at least one communication ready */
       xbt_dynar_foreach(req->comm_waitany.comms, index, act) {
         if (act->comm.src_proc && act->comm.dst_proc){
           return TRUE;
@@ -186,6 +270,7 @@ int MC_request_is_enabled(smx_req_t req)
       break;
 
     default:
+      /* The rest of the request are always enabled */
       return TRUE;
   }
 }
@@ -207,6 +292,11 @@ int MC_request_is_enabled_by_idx(smx_req_t req, unsigned int idx)
       return (act->comm.src_proc && act->comm.dst_proc);
       break;
 
+    case REQ_COMM_TESTANY:
+      act = xbt_dynar_get_as(req->comm_testany.comms, idx, smx_action_t);
+      return (act->comm.src_proc && act->comm.dst_proc);
+      break;
+
     default:
       return TRUE;
   }