Merge branch 'master' into mc-process

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

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index ce77485..ad4d1fa 100644 (file)
--- a/src/mc/mc_request.c
+++ b/src/mc/mc_request.c
@@ -7,6 +7,7 @@
 #include "mc_request.h"
 #include "mc_safety.h"
 #include "mc_private.h"
+#include "mc_smx.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
                                 "Logging specific to MC (request)");
@@ -42,6 +43,8 @@ int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2)
         SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r1) :
         simcall_comm_irecv__get__rdv(r1);
 
+    // FIXME, remote access to comm object
+
     if (rdv != simcall_comm_wait__get__comm(r2)->comm.rdv_cpy
         && simcall_comm_wait__get__timeout(r2) <= 0)
       return FALSE;
@@ -234,20 +237,23 @@ char *MC_request_to_string(smx_simcall_t req, int value)
   smx_mutex_t mutex = NULL;
   size_t size = 0;
 
+  smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+
   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)
+    if (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,
+          bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
+                  MC_smx_process_get_host_name(issuer),
+                  MC_smx_process_get_name(issuer),
                   p, bs);
     else
       args =
-          bprintf("src=(%lu)%s, buff=%s, size=%s", req->issuer->pid,
-                  req->issuer->name, p, bs);
+          bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid,
+                  MC_smx_process_get_name(issuer), p, bs);
     break;
   case SIMCALL_COMM_IRECV:
     size =
@@ -256,15 +262,17 @@ char *MC_request_to_string(smx_simcall_t req, int value)
     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)
+    if (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,
+          bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
+                  MC_smx_process_get_host_name(issuer),
+                  MC_smx_process_get_name(issuer),
                   p, bs);
     else
       args =
-          bprintf("dst=(%lu)%s, buff=%s, size=%s", req->issuer->pid,
-                  req->issuer->name, p, bs);
+          bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid,
+                  MC_smx_process_get_name(issuer),
+                  p, bs);
     break;
   case SIMCALL_COMM_WAIT:
     act = simcall_comm_wait__get__comm(req);
@@ -275,15 +283,16 @@ char *MC_request_to_string(smx_simcall_t req, int value)
     } else {
       type = xbt_strdup("Wait");
       p = pointer_to_string(act);
+      // TODO, fix remote access to comm
+      smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
+      smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
       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 : "");
+                     src_proc ? src_proc->pid : 0,
+                     src_proc ? MC_smx_process_get_host_name(src_proc) : "",
+                     src_proc ? MC_smx_process_get_name(src_proc) : "",
+                     dst_proc ? dst_proc->pid : 0,
+                     dst_proc ? MC_smx_process_get_host_name(dst_proc) : "",
+                     dst_proc ? MC_smx_process_get_name(dst_proc) : "");
     }
     break;
   case SIMCALL_COMM_TEST:
@@ -295,11 +304,16 @@ char *MC_request_to_string(smx_simcall_t req, int value)
     } else {
       type = xbt_strdup("Test TRUE");
       p = pointer_to_string(act);
+      // TODO, get process, get process name
+      smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
+      smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
       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));
+                     src_proc->pid,
+                     MC_smx_process_get_name(src_proc),
+                     MC_smx_process_get_host_name(src_proc),
+                     dst_proc->pid,
+                     MC_smx_process_get_name(dst_proc),
+                     MC_smx_process_get_host_name(dst_proc));
     }
     break;
 
@@ -335,12 +349,6 @@ char *MC_request_to_string(smx_simcall_t req, int value)
     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 = %lu, sleeping = %d", mutex->locked, mutex->owner->pid, xbt_swag_size(mutex->sleeping));
-    break;
-
   case SIMCALL_MC_SNAPSHOT:
     type = xbt_strdup("MC_SNAPSHOT");
     args = NULL;
@@ -361,14 +369,18 @@ char *MC_request_to_string(smx_simcall_t req, int value)
   }
 
   if (args != NULL) {
+    // FIXME, get process name
     str =
-        bprintf("[(%lu)%s (%s)] %s(%s)", req->issuer->pid,
-                MSG_host_get_name(req->issuer->smx_host), req->issuer->name,
+        bprintf("[(%lu)%s (%s)] %s(%s)", issuer->pid,
+                MC_smx_process_get_host_name(issuer),
+                MC_smx_process_get_name(issuer),
                 type, args);
   } else {
+    // FIXME, get process name
     str =
-        bprintf("[(%lu)%s (%s)] %s ", req->issuer->pid,
-                MSG_host_get_name(req->issuer->smx_host), req->issuer->name,
+        bprintf("[(%lu)%s (%s)] %s ", issuer->pid,
+                MC_smx_process_get_host_name(issuer),
+                MC_smx_process_get_name(issuer),
                 type);
   }
 
@@ -385,6 +397,7 @@ unsigned int MC_request_testany_fail(smx_simcall_t req)
   smx_synchro_t action;
 
   xbt_dynar_foreach(simcall_comm_testany__get__comms(req), cursor, action) {
+    // FIXME, remote access to comm object
     if (action->comm.src_proc && action->comm.dst_proc)
       return FALSE;
   }
@@ -396,6 +409,8 @@ int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
 {
   smx_synchro_t act;
 
+  // FIXME, remote access to comm object
+
   switch (req->call) {
 
   case SIMCALL_COMM_WAIT:
@@ -430,131 +445,139 @@ int MC_process_is_enabled(smx_process_t process)
 
 char *MC_request_get_dot_output(smx_simcall_t req, int value)
 {
-
   char *str = NULL, *label = NULL;
   smx_synchro_t act = NULL;
 
+  const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+
   switch (req->call) {
   case SIMCALL_COMM_ISEND:
-    if (req->issuer->smx_host)
+    if (issuer->smx_host)
       label =
-          bprintf("[(%lu)%s] iSend", req->issuer->pid,
-                  MSG_host_get_name(req->issuer->smx_host));
+          bprintf("[(%lu)%s] iSend", issuer->pid,
+                  MC_smx_process_get_host_name(issuer));
     else
-      label = bprintf("[(%lu)] iSend", req->issuer->pid);
+      label = bprintf("[(%lu)] iSend", issuer->pid);
     break;
 
   case SIMCALL_COMM_IRECV:
-    if (req->issuer->smx_host)
+    if (issuer->smx_host)
       label =
-          bprintf("[(%lu)%s] iRecv", req->issuer->pid,
-                  MSG_host_get_name(req->issuer->smx_host));
+          bprintf("[(%lu)%s] iRecv", issuer->pid,
+                  MC_smx_process_get_host_name(issuer));
     else
-      label = bprintf("[(%lu)] iRecv", req->issuer->pid);
+      label = bprintf("[(%lu)] iRecv", issuer->pid);
     break;
 
   case SIMCALL_COMM_WAIT:
     act = simcall_comm_wait__get__comm(req);
     if (value == -1) {
-      if (req->issuer->smx_host)
+      if (issuer->smx_host)
         label =
-            bprintf("[(%lu)%s] WaitTimeout", req->issuer->pid,
-                    MSG_host_get_name(req->issuer->smx_host));
+            bprintf("[(%lu)%s] WaitTimeout", issuer->pid,
+                    MC_smx_process_get_host_name(issuer));
       else
-        label = bprintf("[(%lu)] WaitTimeout", req->issuer->pid);
+        label = bprintf("[(%lu)] WaitTimeout", issuer->pid);
     } else {
-      if (req->issuer->smx_host)
+      // FIXME, remote access to act->comm
+      smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
+      smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
+      if (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);
+            bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid,
+                    MC_smx_process_get_host_name(issuer),
+                    src_proc ? src_proc->pid : 0,
+                    dst_proc ? 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);
+            bprintf("[(%lu)] Wait [(%lu)->(%lu)]", issuer->pid,
+                    src_proc ? src_proc->pid : 0,
+                    dst_proc ? 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)
+      if (issuer->smx_host)
         label =
-            bprintf("[(%lu)%s] Test FALSE", req->issuer->pid,
-                    MSG_host_get_name(req->issuer->smx_host));
+            bprintf("[(%lu)%s] Test FALSE", issuer->pid,
+                    MC_smx_process_get_host_name(issuer));
       else
-        label = bprintf("[(%lu)] Test FALSE", req->issuer->pid);
+        label = bprintf("[(%lu)] Test FALSE", issuer->pid);
     } else {
-      if (req->issuer->smx_host)
+      if (issuer->smx_host)
         label =
-            bprintf("[(%lu)%s] Test TRUE", req->issuer->pid,
-                    MSG_host_get_name(req->issuer->smx_host));
+            bprintf("[(%lu)%s] Test TRUE", issuer->pid,
+                    MC_smx_process_get_host_name(issuer));
       else
-        label = bprintf("[(%lu)] Test TRUE", req->issuer->pid);
+        label = bprintf("[(%lu)] Test TRUE", issuer->pid);
     }
     break;
 
   case SIMCALL_COMM_WAITANY:
-    if (req->issuer->smx_host)
+    if (issuer->smx_host)
       label =
-          bprintf("[(%lu)%s] WaitAny [%d of %lu]", req->issuer->pid,
-                  MSG_host_get_name(req->issuer->smx_host), value + 1,
+          bprintf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid,
+                  MC_smx_process_get_host_name(issuer), value + 1,
                   xbt_dynar_length(simcall_comm_waitany__get__comms(req)));
     else
       label =
-          bprintf("[(%lu)] WaitAny [%d of %lu]", req->issuer->pid, value + 1,
+          bprintf("[(%lu)] WaitAny [%d of %lu]", 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)
+      if (issuer->smx_host)
         label =
-            bprintf("[(%lu)%s] TestAny FALSE", req->issuer->pid,
-                    MSG_host_get_name(req->issuer->smx_host));
+            bprintf("[(%lu)%s] TestAny FALSE", issuer->pid,
+                    MC_smx_process_get_host_name(issuer));
       else
-        label = bprintf("[(%lu)] TestAny FALSE", req->issuer->pid);
+        label = bprintf("[(%lu)] TestAny FALSE", issuer->pid);
     } else {
-      if (req->issuer->smx_host)
+      if (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,
+            bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid,
+                    MC_smx_process_get_host_name(issuer), value + 1,
                     xbt_dynar_length(simcall_comm_testany__get__comms(req)));
       else
         label =
-            bprintf("[(%lu)] TestAny TRUE [%d of %lu]", req->issuer->pid,
+            bprintf("[(%lu)] TestAny TRUE [%d of %lu]", 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_MC_RANDOM:
-    if (req->issuer->smx_host)
+    if (issuer->smx_host)
       label =
-          bprintf("[(%lu)%s] MC_RANDOM (%d)", req->issuer->pid,
-                  MSG_host_get_name(req->issuer->smx_host), value);
+          bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid,
+                  MC_smx_process_get_host_name(issuer), value);
     else
-      label = bprintf("[(%lu)] MC_RANDOM (%d)", req->issuer->pid, value);
+      label = bprintf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
     break;
 
   case SIMCALL_MC_SNAPSHOT:
-    if (req->issuer->smx_host)
+    if (issuer->smx_host)
       label =
-          bprintf("[(%lu)%s] MC_SNAPSHOT", req->issuer->pid,
-                  MSG_host_get_name(req->issuer->smx_host));
+          bprintf("[(%lu)%s] MC_SNAPSHOT", issuer->pid,
+                  MC_smx_process_get_host_name(issuer));
     else
-      label = bprintf("[(%lu)] MC_SNAPSHOT", req->issuer->pid);
+      label = bprintf("[(%lu)] MC_SNAPSHOT", issuer->pid);
     break;
 
   case SIMCALL_MC_COMPARE_SNAPSHOTS:
-    if (req->issuer->smx_host)
+    if (issuer->smx_host)
       label =
-          bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", req->issuer->pid,
-                  MSG_host_get_name(req->issuer->smx_host));
+          bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", issuer->pid,
+                  MC_smx_process_get_host_name(issuer));
     else
-      label = bprintf("[(%lu)] MC_COMPARE_SNAPSHOTS", req->issuer->pid);
+      label = bprintf("[(%lu)] MC_COMPARE_SNAPSHOTS", issuer->pid);
     break;
 
   default:
@@ -563,7 +586,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value)
 
   str =
       bprintf("label = \"%s\", color = %s, fontcolor = %s", label,
-              colors[req->issuer->pid - 1], colors[req->issuer->pid - 1]);
+              colors[issuer->pid - 1], colors[issuer->pid - 1]);
   xbt_free(label);
   return str;