Revert "Revert "[mc] Move MC_random() in mc_client_api.cpp""

[simgrid.git] / src / mc / mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 9144932..c0f9ab9 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -22,6 +22,10 @@
 #include "mc_server.h"
 #endif
 
+#ifdef HAVE_MC
+using simgrid::mc::remote;
+#endif
+
 extern "C" {
 
 XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
@@ -49,6 +53,7 @@ void MC_wait_for_requests(void)
   }
 }
 
+// Called from both MCer and MCed:
 int MC_request_is_enabled(smx_simcall_t req)
 {
   unsigned int index = 0;
@@ -67,10 +72,8 @@ int MC_request_is_enabled(smx_simcall_t req)
 
 #ifdef HAVE_MC
     // Fetch from MCed memory:
-    if (!MC_process_is_self(&mc_model_checker->process())) {
-      MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
-        &temp_synchro, act, sizeof(temp_synchro),
-        MC_PROCESS_INDEX_ANY);
+    if (mc_mode == MC_MODE_SERVER) {
+      mc_model_checker->process().read(&temp_synchro, remote(act));
       act = &temp_synchro;
     }
 #endif
@@ -89,36 +92,41 @@ int MC_request_is_enabled(smx_simcall_t req)
     return (act->comm.src_proc && act->comm.dst_proc);
 
   case SIMCALL_COMM_WAITANY: {
+    xbt_dynar_t comms;
 #ifdef HAVE_MC
-    // Read dynar:
-    s_xbt_dynar_t comms;
-    MC_process_read_simple(&mc_model_checker->process(),
-      &comms, simcall_comm_waitany__get__comms(req), sizeof(comms));
-    // Read dynar buffer:
-    assert(comms.elmsize == sizeof(act));
-    size_t buffer_size = comms.elmsize * comms.used;
-    char buffer[buffer_size];
-    MC_process_read_simple(&mc_model_checker->process(),
-      buffer, comms.data, sizeof(buffer));
-#endif
 
-#ifdef HAVE_MC
-    for (index = 0; index < comms.used; ++index) {
-      memcpy(&act, buffer + comms.elmsize * index, sizeof(act));
+    s_xbt_dynar_t comms_buffer;
+    size_t buffer_size = 0;
+    if (mc_mode == MC_MODE_SERVER) {
+      // Read dynar:
+      mc_model_checker->process().read(
+        &comms_buffer, remote(simcall_comm_waitany__get__comms(req)));
+      assert(comms_buffer.elmsize == sizeof(act));
+      buffer_size = comms_buffer.elmsize * comms_buffer.used;
+      comms = &comms_buffer;
+    } else {
+      comms = simcall_comm_waitany__get__comms(req);
+    }
+    // Read all the dynar buffer:
+    char buffer[buffer_size];
+    if (mc_mode == MC_MODE_SERVER)
+      mc_model_checker->process().read_bytes(buffer, sizeof(buffer),
+        remote(comms->data));
 #else
-    xbt_dynar_foreach(simcall_comm_waitany__get__comms(req), index, act) {
+    comms = simcall_comm_waitany__get__comms(req);
 #endif
 
+    for (index = 0; index < comms->used; ++index) {
 #ifdef HAVE_MC
-      // Fetch from MCed memory:
-      if (!MC_process_is_self(&mc_model_checker->process())) {
-        MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
-          &temp_synchro, act, sizeof(temp_synchro),
-          MC_PROCESS_INDEX_ANY);
+      // Fetch act from MCed memory:
+      if (mc_mode == MC_MODE_SERVER) {
+        memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
+        mc_model_checker->process().read(&temp_synchro, remote(act));
         act = &temp_synchro;
       }
+      else
 #endif
-
+        act = xbt_dynar_get_as(comms, index, smx_synchro_t);
       if (act->comm.src_proc && act->comm.dst_proc)
         return TRUE;
     }
@@ -129,10 +137,8 @@ int MC_request_is_enabled(smx_simcall_t req)
     smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
 #ifdef HAVE_MC
     s_smx_mutex_t temp_mutex;
-    if (!MC_process_is_self(&mc_model_checker->process())) {
-      MC_process_read(&mc_model_checker->process(), MC_ADDRESS_SPACE_READ_FLAGS_NONE,
-        &temp_mutex, mutex, sizeof(temp_mutex),
-        MC_PROCESS_INDEX_ANY);
+    if (mc_mode == MC_MODE_SERVER) {
+      mc_model_checker->process().read(&temp_mutex, remote(mutex));
       mutex = &temp_mutex;
     }
 #endif
@@ -171,12 +177,6 @@ int MC_request_is_visible(smx_simcall_t req)
       ;
 }
 
-int MC_random(int min, int max)
-{
-  /*FIXME: return mc_current_state->executed_transition->random.value; */
-  return simcall_mc_random(min, max);
-}
-
 static int prng_random(int min, int max)
 {
   unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
@@ -210,7 +210,7 @@ void MC_simcall_handle(smx_simcall_t req, int value)
 #ifndef HAVE_MC
   SIMIX_simcall_handle(req, value);
 #else
-  if (MC_process_is_self(&mc_model_checker->process())) {
+  if (mc_mode == MC_MODE_CLIENT) {
     SIMIX_simcall_handle(req, value);
     return;
   }