[mc] Remote xbt_dynar_foreach() in MC_request_testany_fail()

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

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index 03089e4..47609e8 100644 (file)
--- a/src/mc/mc_request.c
+++ b/src/mc/mc_request.c
@@ -4,6 +4,8 @@
 /* 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 <assert.h>
+
 #include "mc_request.h"
 #include "mc_safety.h"
 #include "mc_private.h"
@@ -62,8 +64,6 @@ 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 != synchro2.comm.rdv_cpy
         && simcall_comm_wait__get__timeout(r2) <= 0)
       return FALSE;
@@ -420,7 +420,6 @@ char *MC_request_to_string(smx_simcall_t req, int value)
                 MC_smx_process_get_name(issuer),
                 type, args);
   } else {
-    // FIXME, get process name
     str =
         bprintf("[(%lu)%s (%s)] %s ", issuer->pid,
                 MC_smx_process_get_host_name(issuer),
@@ -433,12 +432,35 @@ char *MC_request_to_string(smx_simcall_t req, int value)
 
 unsigned int MC_request_testany_fail(smx_simcall_t req)
 {
-  unsigned int cursor;
-  smx_synchro_t action;
+  // Remote xbt_dynar_foreach on simcall_comm_testany__get__comms(req).
+
+  // Read the dynar:
+  s_xbt_dynar_t comms;
+  MC_process_read_simple(&mc_model_checker->process,
+    &comms, simcall_comm_testany__get__comms(req), sizeof(comms));
+
+  // Read ther dynar buffer:
+  size_t buffer_size = comms.elmsize * comms.used;
+  char buffer[buffer_size];
+  MC_process_read_simple(&mc_model_checker->process,
+    buffer, comms.data, buffer_size);
+
+  // Iterate over the elements:
+  assert(comms.elmsize == sizeof(smx_synchro_t));
+  unsigned cursor;
+  for (cursor=0; cursor != comms.used; ++cursor) {
 
-  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)
+    // Get the element:
+    smx_synchro_t remote_action;
+    memcpy(buffer + comms.elmsize * cursor, &remote_action, sizeof(remote_action));
+
+    // Dereference the pointer:
+    s_smx_synchro_t action;
+    MC_process_read_simple(&mc_model_checker->process,
+      &action, remote_action, sizeof(action));
+
+    // Finally so something useful about it:
+    if (action.comm.src_proc && action.comm.dst_proc)
       return FALSE;
   }
 
@@ -488,8 +510,7 @@ 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;
+  char *label = NULL;
 
   const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
 
@@ -512,8 +533,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value)
       label = bprintf("[(%lu)] iRecv", issuer->pid);
     break;
 
-  case SIMCALL_COMM_WAIT:
-    act = simcall_comm_wait__get__comm(req);
+  case SIMCALL_COMM_WAIT: {
     if (value == -1) {
       if (issuer->smx_host)
         label =
@@ -522,9 +542,13 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value)
       else
         label = bprintf("[(%lu)] WaitTimeout", issuer->pid);
     } else {
-      // 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);
+      smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
+      s_smx_synchro_t synchro;
+      MC_process_read_simple(&mc_model_checker->process, &synchro,
+        remote_act, sizeof(synchro));
+
+      smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc);
+      smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc);
       if (issuer->smx_host)
         label =
             bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid,
@@ -538,10 +562,14 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value)
                     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) {
+  case SIMCALL_COMM_TEST: {
+    smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
+    s_smx_synchro_t synchro;
+    MC_process_read_simple(&mc_model_checker->process, &synchro,
+      remote_act, sizeof(synchro));
+    if (synchro.comm.src_proc == NULL || synchro.comm.dst_proc == NULL) {
       if (issuer->smx_host)
         label =
             bprintf("[(%lu)%s] Test FALSE", issuer->pid,
@@ -557,18 +585,22 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value)
         label = bprintf("[(%lu)] Test TRUE", issuer->pid);
     }
     break;
+  }
 
-  case SIMCALL_COMM_WAITANY:
+  case SIMCALL_COMM_WAITANY: {
+    unsigned long comms_size = MC_process_read_dynar_length(
+      &mc_model_checker->process, simcall_comm_waitany__get__comms(req));
     if (issuer->smx_host)
       label =
           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)));
+                  comms_size);
     else
       label =
           bprintf("[(%lu)] WaitAny [%d of %lu]", issuer->pid, value + 1,
-                  xbt_dynar_length(simcall_comm_waitany__get__comms(req)));
+                  comms_size);
     break;
+  }
 
   case SIMCALL_COMM_TESTANY:
     if (value == -1) {
@@ -627,7 +659,7 @@ char *MC_request_get_dot_output(smx_simcall_t req, int value)
     THROW_UNIMPLEMENTED;
   }
 
-  str =
+  char* str =
       bprintf("label = \"%s\", color = %s, fontcolor = %s", label,
               colors[issuer->pid - 1], colors[issuer->pid - 1]);
   xbt_free(label);