[mc] Do not take NULL to mean 'the current address space' in dwarf expressions

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

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index 4c59cd0..8a97674 100644 (file)
--- a/src/mc/mc_request.c
+++ b/src/mc/mc_request.c
@@ -447,35 +447,38 @@ unsigned int MC_request_testany_fail(smx_simcall_t req)
 
 int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
 {
-  smx_synchro_t act;
-
-  // FIXME, remote access to comm object
-
+  smx_synchro_t remote_act = NULL;
   switch (req->call) {
 
   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);
+    remote_act = simcall_comm_wait__get__comm(req);
     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);
+  case SIMCALL_COMM_WAITANY: {
+    smx_synchro_t act;
+    MC_process_read_dynar_element(
+      &mc_model_checker->process, &act, simcall_comm_waitany__get__comms(req),
+      idx);
+    }
     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);
+  case SIMCALL_COMM_TESTANY: {
+    s_smx_synchro_t act;
+    MC_process_read_dynar_element(
+      &mc_model_checker->process, &act, simcall_comm_testany__get__comms(req),
+      idx);
+    }
     break;
 
   default:
     return TRUE;
   }
+
+  s_smx_synchro_t synchro;
+  MC_process_read_simple(&mc_model_checker->process,
+    &synchro, remote_act, sizeof(synchro));
+  return synchro.comm.src_proc && synchro.comm.dst_proc;
 }
 
 int MC_process_is_enabled(smx_process_t process)
@@ -485,8 +488,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);
 
@@ -509,8 +511,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 =
@@ -519,9 +520,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,
@@ -535,10 +540,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,
@@ -554,18 +563,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) {
@@ -624,7 +637,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);