[mc] Fix MC with the class-hierarchification of simgrid::simix::Synchro

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 8112d2c..df6234a 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -6,6 +6,8 @@
 
 #include <cassert>
 
+#include <algorithm>
+
 #include <simgrid_config.h>
 
 #include <xbt/log.h>
@@ -20,6 +22,13 @@
 #include "mc/mc.h"
 #include "src/mc/mc_protocol.h"
 
+#include "src/simix/Synchro.h"
+#include "src/simix/SynchroIo.hpp"
+#include "src/simix/SynchroComm.hpp"
+#include "src/simix/SynchroRaw.hpp"
+#include "src/simix/SynchroSleep.hpp"
+#include "src/simix/SynchroExec.hpp"
+
 #if HAVE_MC
 #include "src/mc/mc_request.h"
 #include "src/mc/Process.hpp"
@@ -35,9 +44,11 @@ XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
 
 int MC_random(int min, int max)
 {
+#if HAVE_MC
   xbt_assert(mc_model_checker == nullptr);
   /* TODO, if the MC is disabled we do not really need to make a simcall for
    * this :) */
+#endif
   return simcall_mc_random(min, max);
 }
 
@@ -46,7 +57,9 @@ namespace mc {
 
 void wait_for_requests(void)
 {
+#if HAVE_MC
   xbt_assert(mc_model_checker == nullptr);
+#endif
 
   smx_process_t process;
   smx_simcall_t req;
@@ -66,24 +79,24 @@ void wait_for_requests(void)
 bool request_is_enabled(smx_simcall_t req)
 {
   unsigned int index = 0;
-  smx_synchro_t act = 0;
-#if HAVE_MC
-  s_smx_synchro_t temp_synchro;
-#endif
+  // TODO, add support for the subtypes?
 
   switch (req->call) {
   case SIMCALL_NONE:
     return false;
 
   case SIMCALL_COMM_WAIT:
+  {
     /* FIXME: check also that src and dst processes are not suspended */
-    act = simcall_comm_wait__get__comm(req);
+    simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
 
 #if HAVE_MC
     // Fetch from MCed memory:
+    // HACK, type puning
+    simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
     if (mc_model_checker != nullptr) {
-      mc_model_checker->process().read(&temp_synchro, remote(act));
-      act = &temp_synchro;
+      mc_model_checker->process().read(temp_comm, remote(act));
+      act = static_cast<simgrid::simix::Comm*>(temp_comm.data());
     }
 #endif
 
@@ -94,13 +107,15 @@ bool request_is_enabled(smx_simcall_t req)
         return true;
     }
     /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
-    else if (act->comm.detached && act->comm.src_proc == nullptr
-          && act->comm.type == SIMIX_COMM_READY)
-        return (act->comm.dst_proc != nullptr);
-    return (act->comm.src_proc && act->comm.dst_proc);
+    else if (act->detached && act->src_proc == nullptr
+          && act->type == SIMIX_COMM_READY)
+        return (act->dst_proc != nullptr);
+    return (act->src_proc && act->dst_proc);
+  }
 
   case SIMCALL_COMM_WAITANY: {
     xbt_dynar_t comms;
+    simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
 #if HAVE_MC
 
     s_xbt_dynar_t comms_buffer;
@@ -127,15 +142,17 @@ bool request_is_enabled(smx_simcall_t req)
     for (index = 0; index < comms->used; ++index) {
 #if HAVE_MC
       // Fetch act from MCed memory:
+      // HACK, type puning
+      simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
       if (mc_model_checker != nullptr) {
         memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
-        mc_model_checker->process().read(&temp_synchro, remote(act));
-        act = &temp_synchro;
+        mc_model_checker->process().read(temp_comm, remote(act));
+        act = static_cast<simgrid::simix::Comm*>(temp_comm.data());
       }
       else
 #endif
-        act = xbt_dynar_get_as(comms, index, smx_synchro_t);
-      if (act->comm.src_proc && act->comm.dst_proc)
+        act = xbt_dynar_get_as(comms, index, simgrid::simix::Comm*);
+      if (act->src_proc && act->dst_proc)
         return true;
     }
     return false;