Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
model-checker : mutex owner may be NULL after UNLOCK
[simgrid.git] / src / mc / mc_request.c
index 2927c51..3d7638c 100644 (file)
-#include "private.h"
+/* Copyright (c) 2008-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include "mc_request.h"
+#include "mc_safety.h"
+#include "mc_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
                                 "Logging specific to MC (request)");
 
-static char* pointer_to_string(void* pointer);
+static char *pointer_to_string(void *pointer);
+static char *buff_size_to_string(size_t size);
 
-int MC_request_depend(smx_req_t r1, smx_req_t r2)
+int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2)
 {
-  if(_surf_do_model_check == 2)
+  if (mc_reduce_kind == e_mc_reduce_none)
     return TRUE;
 
   if (r1->issuer == r2->issuer)
     return FALSE;
 
-  if(r1->call == REQ_COMM_ISEND && r2->call == REQ_COMM_IRECV)
+  /* Wait with timeout transitions are not considered by the independance theorem, thus we consider them as dependant with all other transitions */
+  if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0)
+      || (r2->call == SIMCALL_COMM_WAIT
+          && simcall_comm_wait__get__timeout(r2) > 0))
+    return TRUE;
+
+  if (r1->call == SIMCALL_COMM_ISEND && r2->call == SIMCALL_COMM_IRECV)
     return FALSE;
 
-  if(r1->call == REQ_COMM_IRECV && r2->call == REQ_COMM_ISEND)
+  if (r1->call == SIMCALL_COMM_IRECV && r2->call == SIMCALL_COMM_ISEND)
     return FALSE;
 
-  if(   (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV)
-       &&  r2->call == REQ_COMM_WAIT){
+  if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
+      && r2->call == SIMCALL_COMM_WAIT) {
 
-    if(r2->comm_wait.comm->comm.rdv == NULL)
-      return FALSE;
+    smx_rdv_t rdv =
+        r1->call ==
+        SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r1) :
+        simcall_comm_irecv__get__rdv(r1);
 
-    smx_rdv_t rdv = r1->call == REQ_COMM_ISEND ? r1->comm_isend.rdv : r1->comm_irecv.rdv;
+    if (rdv != simcall_comm_wait__get__comm(r2)->comm.rdv_cpy
+        && simcall_comm_wait__get__timeout(r2) <= 0)
+      return FALSE;
 
-    if(r2->comm_wait.comm->comm.rdv != rdv)
+    if ((r1->issuer != simcall_comm_wait__get__comm(r2)->comm.src_proc)
+        && (r1->issuer != simcall_comm_wait__get__comm(r2)->comm.dst_proc)
+        && simcall_comm_wait__get__timeout(r2) <= 0)
       return FALSE;
 
-    if(r2->comm_wait.comm->comm.type == SIMIX_COMM_SEND && r1->call == REQ_COMM_ISEND)
+    if ((r1->call == SIMCALL_COMM_ISEND)
+        && (simcall_comm_wait__get__comm(r2)->comm.type == SIMIX_COMM_SEND)
+        && (simcall_comm_wait__get__comm(r2)->comm.src_buff !=
+            simcall_comm_isend__get__src_buff(r1))
+        && simcall_comm_wait__get__timeout(r2) <= 0)
       return FALSE;
 
-    if(r2->comm_wait.comm->comm.type == SIMIX_COMM_RECEIVE && r1->call == REQ_COMM_IRECV)
+    if ((r1->call == SIMCALL_COMM_IRECV)
+        && (simcall_comm_wait__get__comm(r2)->comm.type == SIMIX_COMM_RECEIVE)
+        && (simcall_comm_wait__get__comm(r2)->comm.dst_buff !=
+            simcall_comm_irecv__get__dst_buff(r1))
+        && simcall_comm_wait__get__timeout(r2) <= 0)
       return FALSE;
   }
 
-  if(   (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV)
-       &&  r1->call == REQ_COMM_WAIT){
+  if ((r2->call == SIMCALL_COMM_ISEND || r2->call == SIMCALL_COMM_IRECV)
+      && r1->call == SIMCALL_COMM_WAIT) {
 
-    if(r1->comm_wait.comm->comm.rdv != NULL)
-      return FALSE;
+    smx_rdv_t rdv =
+        r2->call ==
+        SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r2) :
+        simcall_comm_irecv__get__rdv(r2);
 
-    smx_rdv_t rdv = r2->call == REQ_COMM_ISEND ? r2->comm_isend.rdv : r2->comm_irecv.rdv;
+    if (rdv != simcall_comm_wait__get__comm(r1)->comm.rdv_cpy
+        && simcall_comm_wait__get__timeout(r1) <= 0)
+      return FALSE;
 
-    if(r1->comm_wait.comm->comm.rdv != rdv)
+    if ((r2->issuer != simcall_comm_wait__get__comm(r1)->comm.src_proc)
+        && (r2->issuer != simcall_comm_wait__get__comm(r1)->comm.dst_proc)
+        && simcall_comm_wait__get__timeout(r1) <= 0)
       return FALSE;
 
-    if(r1->comm_wait.comm->comm.type == SIMIX_COMM_SEND && r2->call == REQ_COMM_ISEND)
+    if ((r2->call == SIMCALL_COMM_ISEND)
+        && (simcall_comm_wait__get__comm(r1)->comm.type == SIMIX_COMM_SEND)
+        && (simcall_comm_wait__get__comm(r1)->comm.src_buff !=
+            simcall_comm_isend__get__src_buff(r2))
+        && simcall_comm_wait__get__timeout(r1) <= 0)
       return FALSE;
 
-    if(r1->comm_wait.comm->comm.type == SIMIX_COMM_RECEIVE && r2->call == REQ_COMM_IRECV)
+    if ((r2->call == SIMCALL_COMM_IRECV)
+        && (simcall_comm_wait__get__comm(r1)->comm.type == SIMIX_COMM_RECEIVE)
+        && (simcall_comm_wait__get__comm(r1)->comm.dst_buff !=
+            simcall_comm_irecv__get__dst_buff(r2))
+        && simcall_comm_wait__get__timeout(r1) <= 0)
       return FALSE;
   }
 
   /* FIXME: the following rule assumes that the result of the
    * isend/irecv call is not stored in a buffer used in the
    * test call. */
-  if(   (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV)
-     &&  r2->call == REQ_COMM_TEST)
-    return FALSE;
+  /*if(   (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
+     &&  r2->call == SIMCALL_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
    * test call.*/
-  if(   (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV)
-     && r1->call == REQ_COMM_TEST)
+  /*if(   (r2->call == SIMCALL_COMM_ISEND || r2->call == SIMCALL_COMM_IRECV)
+     && r1->call == SIMCALL_COMM_TEST)
+     return FALSE; */
+
+  if (r1->call == SIMCALL_COMM_ISEND && r2->call == SIMCALL_COMM_ISEND
+      && simcall_comm_isend__get__rdv(r1) != simcall_comm_isend__get__rdv(r2))
     return FALSE;
 
-  if(r1->call == REQ_COMM_ISEND && r2->call == REQ_COMM_ISEND
-      && r1->comm_isend.rdv != r2->comm_isend.rdv)
+  if (r1->call == SIMCALL_COMM_IRECV && r2->call == SIMCALL_COMM_IRECV
+      && simcall_comm_irecv__get__rdv(r1) != simcall_comm_irecv__get__rdv(r2))
     return FALSE;
 
-  if(r1->call == REQ_COMM_IRECV && r2->call == REQ_COMM_IRECV
-      && r1->comm_irecv.rdv != r2->comm_irecv.rdv)
+  if (r1->call == SIMCALL_COMM_WAIT
+      && (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
+      && (simcall_comm_wait__get__comm(r1)->comm.src_proc == NULL
+          || simcall_comm_wait__get__comm(r1)->comm.dst_proc == NULL))
     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))
+  if (r2->call == SIMCALL_COMM_WAIT
+      && (r1->call == SIMCALL_COMM_WAIT || r1->call == SIMCALL_COMM_TEST)
+      && (simcall_comm_wait__get__comm(r2)->comm.src_proc == NULL
+          || simcall_comm_wait__get__comm(r2)->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))
+  if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_WAIT
+      && simcall_comm_wait__get__comm(r1)->comm.src_buff ==
+      simcall_comm_wait__get__comm(r2)->comm.src_buff
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff ==
+      simcall_comm_wait__get__comm(r2)->comm.dst_buff)
     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)
+  if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_WAIT
+      && simcall_comm_wait__get__comm(r1)->comm.src_buff != NULL
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff != NULL
+      && simcall_comm_wait__get__comm(r2)->comm.src_buff != NULL
+      && simcall_comm_wait__get__comm(r2)->comm.dst_buff != NULL
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff !=
+      simcall_comm_wait__get__comm(r2)->comm.src_buff
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff !=
+      simcall_comm_wait__get__comm(r2)->comm.dst_buff
+      && simcall_comm_wait__get__comm(r2)->comm.dst_buff !=
+      simcall_comm_wait__get__comm(r1)->comm.src_buff)
     return FALSE;
 
-  if (r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_WAIT
-      && r1->comm_wait.comm->comm.src_buff != NULL
-      && r1->comm_wait.comm->comm.dst_buff != NULL
-      && r2->comm_wait.comm->comm.src_buff != NULL
-      && r2->comm_wait.comm->comm.dst_buff != NULL
-      && r1->comm_wait.comm->comm.dst_buff != r2->comm_wait.comm->comm.src_buff
-      && r1->comm_wait.comm->comm.dst_buff != r2->comm_wait.comm->comm.dst_buff
-      && r2->comm_wait.comm->comm.dst_buff != r1->comm_wait.comm->comm.src_buff)
+  if (r1->call == SIMCALL_COMM_TEST &&
+      (simcall_comm_test__get__comm(r1) == NULL
+       || simcall_comm_test__get__comm(r1)->comm.src_buff == NULL
+       || simcall_comm_test__get__comm(r1)->comm.dst_buff == NULL))
     return FALSE;
 
-  if(r1->call == REQ_COMM_TEST &&
-      (r1->comm_test.comm == NULL
-       || r1->comm_test.comm->comm.src_buff == NULL
-       || r1->comm_test.comm->comm.dst_buff == NULL))
+  if (r2->call == SIMCALL_COMM_TEST &&
+      (simcall_comm_test__get__comm(r2) == NULL
+       || simcall_comm_test__get__comm(r2)->comm.src_buff == NULL
+       || simcall_comm_test__get__comm(r2)->comm.dst_buff == NULL))
     return FALSE;
 
-  if(r2->call == REQ_COMM_TEST &&
-      (r2->comm_test.comm == NULL
-       || r2->comm_test.comm->comm.src_buff == NULL
-       || r2->comm_test.comm->comm.dst_buff == NULL))
+  if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT
+      && simcall_comm_test__get__comm(r1)->comm.src_buff ==
+      simcall_comm_wait__get__comm(r2)->comm.src_buff
+      && simcall_comm_test__get__comm(r1)->comm.dst_buff ==
+      simcall_comm_wait__get__comm(r2)->comm.dst_buff)
     return FALSE;
 
-  if(r1->call == REQ_COMM_TEST && r2->call == REQ_COMM_WAIT
-      && r1->comm_test.comm->comm.src_buff == r2->comm_wait.comm->comm.src_buff
-      && r1->comm_test.comm->comm.dst_buff == r2->comm_wait.comm->comm.dst_buff)
+  if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST
+      && simcall_comm_wait__get__comm(r1)->comm.src_buff ==
+      simcall_comm_test__get__comm(r2)->comm.src_buff
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff ==
+      simcall_comm_test__get__comm(r2)->comm.dst_buff)
     return FALSE;
 
-  if(r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_TEST
-      && r1->comm_wait.comm->comm.src_buff == r2->comm_test.comm->comm.src_buff
-      && r1->comm_wait.comm->comm.dst_buff == r2->comm_test.comm->comm.dst_buff)
+  if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST
+      && simcall_comm_wait__get__comm(r1)->comm.src_buff != NULL
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff != NULL
+      && simcall_comm_test__get__comm(r2)->comm.src_buff != NULL
+      && simcall_comm_test__get__comm(r2)->comm.dst_buff != NULL
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff !=
+      simcall_comm_test__get__comm(r2)->comm.src_buff
+      && simcall_comm_wait__get__comm(r1)->comm.dst_buff !=
+      simcall_comm_test__get__comm(r2)->comm.dst_buff
+      && simcall_comm_test__get__comm(r2)->comm.dst_buff !=
+      simcall_comm_wait__get__comm(r1)->comm.src_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)
+  if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT
+      && simcall_comm_test__get__comm(r1)->comm.src_buff != NULL
+      && simcall_comm_test__get__comm(r1)->comm.dst_buff != NULL
+      && simcall_comm_wait__get__comm(r2)->comm.src_buff != NULL
+      && simcall_comm_wait__get__comm(r2)->comm.dst_buff != NULL
+      && simcall_comm_test__get__comm(r1)->comm.dst_buff !=
+      simcall_comm_wait__get__comm(r2)->comm.src_buff
+      && simcall_comm_test__get__comm(r1)->comm.dst_buff !=
+      simcall_comm_wait__get__comm(r2)->comm.dst_buff
+      && simcall_comm_wait__get__comm(r2)->comm.dst_buff !=
+      simcall_comm_test__get__comm(r1)->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;
 }
 
-static char* pointer_to_string(void* pointer) {
+static char *pointer_to_string(void *pointer)
+{
 
   if (XBT_LOG_ISENABLED(mc_request, xbt_log_priority_verbose))
     return bprintf("%p", pointer);
@@ -155,178 +217,362 @@ static char* pointer_to_string(void* pointer) {
   return xbt_strdup("(verbose only)");
 }
 
-char *MC_request_to_string(smx_req_t req, int value)
+static char *buff_size_to_string(size_t buff_size)
 {
-  char *type = NULL, *args = NULL, *str = NULL, *p = NULL;
-  smx_action_t act = NULL;
+
+  if (XBT_LOG_ISENABLED(mc_request, xbt_log_priority_verbose))
+    return bprintf("%zu", buff_size);
+
+  return xbt_strdup("(verbose only)");
+}
+
+
+char *MC_request_to_string(smx_simcall_t req, int value)
+{
+  char *type = NULL, *args = NULL, *str = NULL, *p = NULL, *bs = NULL;
+  smx_synchro_t act = NULL;
+  smx_mutex_t mutex = NULL;
   size_t size = 0;
 
-  switch(req->call){
-    case REQ_COMM_ISEND:
-      type = xbt_strdup("iSend");
-      p = pointer_to_string(req->comm_isend.src_buff);
-      args = bprintf("src=%s, buff=%s, size=%zu", req->issuer->name, 
-                     p, 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 = xbt_strdup("iRecv");
-      p = pointer_to_string(req->comm_irecv.dst_buff); 
-      args = bprintf("dst=%s, buff=%s, size=%zu", req->issuer->name, 
-                     p, size);
-      break;
-    case REQ_COMM_WAIT:
-      act = req->comm_wait.comm;
-      if(value == -1){
-        type = xbt_strdup("WaitTimeout");
-       p = pointer_to_string(act);
-       args = bprintf("comm=%p", p);
-      }else{
-        type = xbt_strdup("Wait");
-       p = pointer_to_string(act);
-       args  = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p,
-                        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;
-      if(act->comm.src_proc == NULL || act->comm.src_proc == NULL){
-        type = xbt_strdup("Test FALSE");
-       p = pointer_to_string(act);
-        args = bprintf("comm=%s", p);
-      }else{
-        type = xbt_strdup("Test TRUE");
-       p = pointer_to_string(act);
-        args  = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p,
-                        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 = xbt_strdup("WaitAny");
-      p = pointer_to_string(xbt_dynar_get_as(req->comm_waitany.comms, value, smx_action_t));
-      args = bprintf("comm=%s (%d of %lu)", p,
-                     value+1, xbt_dynar_length(req->comm_waitany.comms));
-      break;
-
-    case REQ_COMM_TESTANY:
-      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;
+  switch (req->call) {
+  case SIMCALL_COMM_ISEND:
+    type = xbt_strdup("iSend");
+    p = pointer_to_string(simcall_comm_isend__get__src_buff(req));
+    bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
+    if (req->issuer->smx_host)
+      args =
+          bprintf("src=(%lu)%s (%s), buff=%s, size=%s", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host), req->issuer->name,
+                  p, bs);
+    else
+      args =
+          bprintf("src=(%lu)%s, buff=%s, size=%s", req->issuer->pid,
+                  req->issuer->name, p, bs);
+    break;
+  case SIMCALL_COMM_IRECV:
+    size =
+        simcall_comm_irecv__get__dst_buff_size(req) ?
+        *simcall_comm_irecv__get__dst_buff_size(req) : 0;
+    type = xbt_strdup("iRecv");
+    p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
+    bs = buff_size_to_string(size);
+    if (req->issuer->smx_host)
+      args =
+          bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host), req->issuer->name,
+                  p, bs);
+    else
+      args =
+          bprintf("dst=(%lu)%s, buff=%s, size=%s", req->issuer->pid,
+                  req->issuer->name, p, bs);
+    break;
+  case SIMCALL_COMM_WAIT:
+    act = simcall_comm_wait__get__comm(req);
+    if (value == -1) {
+      type = xbt_strdup("WaitTimeout");
+      p = pointer_to_string(act);
+      args = bprintf("comm=%s", p);
+    } else {
+      type = xbt_strdup("Wait");
+      p = pointer_to_string(act);
+      args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
+                     act->comm.src_proc ? act->comm.src_proc->pid : 0,
+                     act->comm.src_proc ? MSG_host_get_name(act->comm.src_proc->
+                                                            smx_host) : "",
+                     act->comm.src_proc ? act->comm.src_proc->name : "",
+                     act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
+                     act->comm.dst_proc ? MSG_host_get_name(act->comm.dst_proc->
+                                                            smx_host) : "",
+                     act->comm.dst_proc ? act->comm.dst_proc->name : "");
+    }
+    break;
+  case SIMCALL_COMM_TEST:
+    act = simcall_comm_test__get__comm(req);
+    if (act->comm.src_proc == NULL || act->comm.dst_proc == NULL) {
+      type = xbt_strdup("Test FALSE");
+      p = pointer_to_string(act);
+      args = bprintf("comm=%s", p);
+    } else {
+      type = xbt_strdup("Test TRUE");
+      p = pointer_to_string(act);
+      args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
+                     act->comm.src_proc->pid, act->comm.src_proc->name,
+                     MSG_host_get_name(act->comm.src_proc->smx_host),
+                     act->comm.dst_proc->pid, act->comm.dst_proc->name,
+                     MSG_host_get_name(act->comm.dst_proc->smx_host));
+    }
+    break;
+
+  case SIMCALL_COMM_WAITANY:
+    type = xbt_strdup("WaitAny");
+    if (!xbt_dynar_is_empty(simcall_comm_waitany__get__comms(req))) {
+      p = pointer_to_string(xbt_dynar_get_as
+                            (simcall_comm_waitany__get__comms(req), value,
+                             smx_synchro_t));
+      args =
+          bprintf("comm=%s (%d of %lu)", p, value + 1,
+                  xbt_dynar_length(simcall_comm_waitany__get__comms(req)));
+    } else {
+      args = bprintf("comm at idx %d", value);
+    }
+    break;
+
+  case SIMCALL_COMM_TESTANY:
+    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(simcall_comm_testany__get__comms(req)));
+    }
+    break;
+
+  case SIMCALL_MUTEX_LOCK:
+    mutex = simcall_mutex_lock__get__mutex(req);
+    type = xbt_strdup("Mutex LOCK");
+    args = bprintf("locked = %d, owner = %d, sleeping = %d", mutex->locked, mutex->owner != NULL ? (int)mutex->owner->pid : -1, xbt_swag_size(mutex->sleeping));
+    break;
+
+  case SIMCALL_MUTEX_UNLOCK:
+    type = xbt_strdup("Mutex UNLOCK");
+    mutex = simcall_mutex_unlock__get__mutex(req);
+    args = bprintf("locked = %d, owner = %d, sleeping = %d", mutex->locked, mutex->owner != NULL ? (int)mutex->owner->pid : -1, xbt_swag_size(mutex->sleeping));
+    break;
+
+  case SIMCALL_MC_SNAPSHOT:
+    type = xbt_strdup("MC_SNAPSHOT");
+    args = NULL;
+    break;
+
+  case SIMCALL_MC_COMPARE_SNAPSHOTS:
+    type = xbt_strdup("MC_COMPARE_SNAPSHOTS");
+    args = NULL;
+    break;
+
+  case SIMCALL_MC_RANDOM:
+    type = xbt_strdup("MC_RANDOM");
+    args = bprintf("%d", value);
+    break;
+
+  default:
+    THROW_UNIMPLEMENTED;
+  }
+
+  if (args != NULL) {
+    str =
+        bprintf("[(%lu)%s (%s)] %s(%s)", req->issuer->pid,
+                MSG_host_get_name(req->issuer->smx_host), req->issuer->name,
+                type, args);
+  } else {
+    str =
+        bprintf("[(%lu)%s (%s)] %s ", req->issuer->pid,
+                MSG_host_get_name(req->issuer->smx_host), req->issuer->name,
+                type);
   }
 
-  str = bprintf("[(%lu)%s] %s (%s)", req->issuer->pid ,req->issuer->name, type, args);
-  xbt_free(type);
   xbt_free(args);
+  xbt_free(type);
   xbt_free(p);
+  xbt_free(bs);
   return str;
 }
 
-unsigned int MC_request_testany_fail(smx_req_t req)
+unsigned int MC_request_testany_fail(smx_simcall_t req)
 {
   unsigned int cursor;
-  smx_action_t action;
+  smx_synchro_t action;
 
-  xbt_dynar_foreach(req->comm_testany.comms, cursor, action){
-    if(action->comm.src_proc && action->comm.dst_proc)
+  xbt_dynar_foreach(simcall_comm_testany__get__comms(req), cursor, action) {
+    if (action->comm.src_proc && action->comm.dst_proc)
       return FALSE;
   }
 
   return TRUE;
 }
 
-int MC_request_is_visible(smx_req_t req)
-{
-  return req->call == REQ_COMM_ISEND
-     || req->call == REQ_COMM_IRECV
-     || req->call == REQ_COMM_WAIT
-     || req->call == REQ_COMM_WAITANY
-     || req->call == REQ_COMM_TEST
-     || req->call == REQ_COMM_TESTANY;
-}
-
-int MC_request_is_enabled(smx_req_t req)
+int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
 {
-  unsigned int index = 0;
-  smx_action_t act;
+  smx_synchro_t act;
 
   switch (req->call) {
 
-    case REQ_COMM_WAIT:
-      /* FIXME: check also that src and dst processes are not suspended */
-
-      /* 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;
-      }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;
-        }
-      }
-      return FALSE;
-      break;
-
-    default:
-      /* The rest of the request are always enabled */
-      return TRUE;
+  case SIMCALL_COMM_WAIT:
+    /* FIXME: check also that src and dst processes are not suspended */
+    act = simcall_comm_wait__get__comm(req);
+    return (act->comm.src_proc && act->comm.dst_proc);
+    break;
+
+  case SIMCALL_COMM_WAITANY:
+    act =
+        xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), idx,
+                         smx_synchro_t);
+    return (act->comm.src_proc && act->comm.dst_proc);
+    break;
+
+  case SIMCALL_COMM_TESTANY:
+    act =
+        xbt_dynar_get_as(simcall_comm_testany__get__comms(req), idx,
+                         smx_synchro_t);
+    return (act->comm.src_proc && act->comm.dst_proc);
+    break;
+
+  default:
+    return TRUE;
   }
 }
 
-int MC_request_is_enabled_by_idx(smx_req_t req, unsigned int idx)
+int MC_process_is_enabled(smx_process_t process)
 {
-  smx_action_t act;
-
-  switch (req->call) {
-
-    case REQ_COMM_WAIT:
-      /* FIXME: check also that src and dst processes are not suspended */
-      act = req->comm_wait.comm;
-      return (act->comm.src_proc && act->comm.dst_proc);
-      break;
-
-    case REQ_COMM_WAITANY:
-      act = xbt_dynar_get_as(req->comm_waitany.comms, idx, smx_action_t);
-      return (act->comm.src_proc && act->comm.dst_proc);
-      break;
+  return MC_request_is_enabled(&process->simcall);
+}
 
-    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;
+char *MC_request_get_dot_output(smx_simcall_t req, int value)
+{
 
-    default:
-      return TRUE;
+  char *str = NULL, *label = NULL;
+  smx_synchro_t act = NULL;
+  
+  switch (req->call) {
+  case SIMCALL_COMM_ISEND:
+    if (req->issuer->smx_host)
+      label =
+          bprintf("[(%lu)%s] iSend", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host));
+    else
+      label = bprintf("[(%lu)] iSend", req->issuer->pid);
+    break;
+
+  case SIMCALL_COMM_IRECV:
+    if (req->issuer->smx_host)
+      label =
+          bprintf("[(%lu)%s] iRecv", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host));
+    else
+      label = bprintf("[(%lu)] iRecv", req->issuer->pid);
+    break;
+
+  case SIMCALL_COMM_WAIT:
+    act = simcall_comm_wait__get__comm(req);
+    if (value == -1) {
+      if (req->issuer->smx_host)
+        label =
+            bprintf("[(%lu)%s] WaitTimeout", req->issuer->pid,
+                    MSG_host_get_name(req->issuer->smx_host));
+      else
+        label = bprintf("[(%lu)] WaitTimeout", req->issuer->pid);
+    } else {
+      if (req->issuer->smx_host)
+        label =
+            bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", req->issuer->pid,
+                    MSG_host_get_name(req->issuer->smx_host),
+                    act->comm.src_proc ? act->comm.src_proc->pid : 0,
+                    act->comm.dst_proc ? act->comm.dst_proc->pid : 0);
+      else
+        label =
+            bprintf("[(%lu)] Wait [(%lu)->(%lu)]", req->issuer->pid,
+                    act->comm.src_proc ? act->comm.src_proc->pid : 0,
+                    act->comm.dst_proc ? act->comm.dst_proc->pid : 0);
+    }
+    break;
+
+  case SIMCALL_COMM_TEST:
+    act = simcall_comm_test__get__comm(req);
+    if (act->comm.src_proc == NULL || act->comm.dst_proc == NULL) {
+      if (req->issuer->smx_host)
+        label =
+            bprintf("[(%lu)%s] Test FALSE", req->issuer->pid,
+                    MSG_host_get_name(req->issuer->smx_host));
+      else
+        label = bprintf("[(%lu)] Test FALSE", req->issuer->pid);
+    } else {
+      if (req->issuer->smx_host)
+        label =
+            bprintf("[(%lu)%s] Test TRUE", req->issuer->pid,
+                    MSG_host_get_name(req->issuer->smx_host));
+      else
+        label = bprintf("[(%lu)] Test TRUE", req->issuer->pid);
+    }
+    break;
+
+  case SIMCALL_COMM_WAITANY:
+    if (req->issuer->smx_host)
+      label =
+          bprintf("[(%lu)%s] WaitAny [%d of %lu]", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host), value + 1,
+                  xbt_dynar_length(simcall_comm_waitany__get__comms(req)));
+    else
+      label =
+          bprintf("[(%lu)] WaitAny [%d of %lu]", req->issuer->pid, value + 1,
+                  xbt_dynar_length(simcall_comm_waitany__get__comms(req)));
+    break;
+
+  case SIMCALL_COMM_TESTANY:
+    if (value == -1) {
+      if (req->issuer->smx_host)
+        label =
+            bprintf("[(%lu)%s] TestAny FALSE", req->issuer->pid,
+                    MSG_host_get_name(req->issuer->smx_host));
+      else
+        label = bprintf("[(%lu)] TestAny FALSE", req->issuer->pid);
+    } else {
+      if (req->issuer->smx_host)
+        label =
+            bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", req->issuer->pid,
+                    MSG_host_get_name(req->issuer->smx_host), value + 1,
+                    xbt_dynar_length(simcall_comm_testany__get__comms(req)));
+      else
+        label =
+            bprintf("[(%lu)] TestAny TRUE [%d of %lu]", req->issuer->pid,
+                    value + 1,
+                    xbt_dynar_length(simcall_comm_testany__get__comms(req)));
+    }
+    break;
+
+  case SIMCALL_MUTEX_LOCK:
+    label = bprintf("[(%lu)] Mutex LOCK", req->issuer->pid);
+    break;
+    
+  case SIMCALL_MUTEX_UNLOCK:
+    label = bprintf("[(%lu)] Mutex UNLOCK", req->issuer->pid);
+    break;
+
+  case SIMCALL_MC_RANDOM:
+    if (req->issuer->smx_host)
+      label =
+          bprintf("[(%lu)%s] MC_RANDOM (%d)", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host), value);
+    else
+      label = bprintf("[(%lu)] MC_RANDOM (%d)", req->issuer->pid, value);
+    break;
+
+  case SIMCALL_MC_SNAPSHOT:
+    if (req->issuer->smx_host)
+      label =
+          bprintf("[(%lu)%s] MC_SNAPSHOT", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host));
+    else
+      label = bprintf("[(%lu)] MC_SNAPSHOT", req->issuer->pid);
+    break;
+
+  case SIMCALL_MC_COMPARE_SNAPSHOTS:
+    if (req->issuer->smx_host)
+      label =
+          bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", req->issuer->pid,
+                  MSG_host_get_name(req->issuer->smx_host));
+    else
+      label = bprintf("[(%lu)] MC_COMPARE_SNAPSHOTS", req->issuer->pid);
+    break;
+
+  default:
+    THROW_UNIMPLEMENTED;
   }
-}
 
-int MC_process_is_enabled(smx_process_t process)
-{
-  if (process->request.call != REQ_NO_REQ && MC_request_is_enabled(&process->request))
-    return TRUE;
+  str =
+      bprintf("label = \"%s\", color = %s, fontcolor = %s", label,
+              colors[req->issuer->pid - 1], colors[req->issuer->pid - 1]);
+  xbt_free(label);
+  return str;
 
-  return FALSE;
 }