Replace, when possible, calls to bprintf() by calls to xbt_strdup().

[simgrid.git] / src / mc / mc_request.c

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index f9b8f47..75a27c0 100644 (file)
--- 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;
 
@@ -22,10 +25,10 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2)
     if(r2->comm_wait.comm->comm.rdv != rdv)
       return FALSE;
 
-    if(r2->comm_wait.comm->type == SIMIX_COMM_SEND && r1->call == REQ_COMM_ISEND)
+    if(r2->comm_wait.comm->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)
+    if(r2->comm_wait.comm->comm.type == SIMIX_COMM_RECEIVE && r1->call == REQ_COMM_IRECV)
       return FALSE;
   }
 
@@ -40,10 +43,10 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2)
     if(r1->comm_wait.comm->comm.rdv != rdv)
       return FALSE;
 
-    if(r1->comm_wait.comm->type == SIMIX_COMM_SEND && r2->call == REQ_COMM_ISEND)
+    if(r1->comm_wait.comm->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)
+    if(r1->comm_wait.comm->comm.type == SIMIX_COMM_RECEIVE && r2->call == REQ_COMM_IRECV)
       return FALSE;
   }
 
@@ -69,8 +72,6 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2)
       && r1->comm_irecv.rdv != r2->comm_irecv.rdv)
     return FALSE;
 
-  /* If any of the request is a timeout wait, and it reached
-   * this point, it won't be dependent with any other request. */
   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))
@@ -149,54 +150,60 @@ char *MC_request_to_string(smx_req_t req, int value)
   
   switch(req->call){
     case REQ_COMM_ISEND:
-      type = bprintf("iSend");
+      type = xbt_strdup("iSend");
       args = bprintf("src=%s, buff=%p, size=%zu", req->issuer->name, 
                      req->comm_isend.src_buff, req->comm_isend.src_buff_size);
       break;
     case REQ_COMM_IRECV:
       size = req->comm_irecv.dst_buff_size ? *req->comm_irecv.dst_buff_size : 0;
-      type = bprintf("iRecv");
+      type = xbt_strdup("iRecv");
       args = bprintf("dst=%s, buff=%p, size=%zu", req->issuer->name, 
                      req->comm_irecv.dst_buff, size);
       break;
     case REQ_COMM_WAIT:
       act = req->comm_wait.comm;
       if(value == -1){
-        type = bprintf("Wait Timeout");
+        type = xbt_strdup("WaitTimeout");
         args = bprintf("comm=%p", act);
       }else{
-        type = bprintf("Wait");
-        args  = bprintf("comm=%p [%s(%lu) -> %s(%lu)]", act,
-                        act->comm.src_proc ? act->comm.src_proc->name : "",
+        type = xbt_strdup("Wait");
+        args  = bprintf("comm=%p [(%lu)%s -> (%lu)%s]", act,
                         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);
+                        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;
       if(act->comm.src_proc == NULL || act->comm.src_proc == NULL){
-        type = bprintf("Test FALSE");
+        type = xbt_strdup("Test FALSE");
         args = bprintf("comm=%p", act);
       }else{
-        type = bprintf("Test TRUE");
-        args  = bprintf("comm=%p [%s -> %s]", act,
-                        act->comm.src_proc ? act->comm.src_proc->name : "",
-                        act->comm.dst_proc ? act->comm.dst_proc->name : "");
+        type = xbt_strdup("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 */
+      type = xbt_strdup("WaitAny");
+      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 = xbt_strdup("TestAny FALSE");
+        args = xbt_strdup("-");
+      }else{
+        type = xbt_strdup("TestAny");
+        args = bprintf("(%d of %lu)", value+1, xbt_dynar_length(req->comm_testany.comms));
+      }
+      break;
 
     default:
       THROW_UNIMPLEMENTED;
@@ -285,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;
   }