X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb1146f712f533bddd739ec73bfd7d5c58e2cdc3..9d7dca1d2de1e6d67027e4ba33fefe1eb09550e3:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index b188c03cad..7c350f7e7f 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -20,6 +20,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"
@@ -70,24 +77,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.getBuffer());
     }
 #endif
 
@@ -98,13 +105,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;
@@ -131,15 +140,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.getBuffer());
       }
       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;
@@ -151,10 +162,10 @@ bool request_is_enabled(smx_simcall_t req)
   case SIMCALL_MUTEX_LOCK: {
     smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
 #if HAVE_MC
-    s_smx_mutex_t temp_mutex;
+    simgrid::mc::Remote<simgrid::simix::Mutex> temp_mutex;
     if (mc_model_checker != nullptr) {
-      mc_model_checker->process().read(&temp_mutex, remote(mutex));
-      mutex = &temp_mutex;
+      mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex));
+      mutex = temp_mutex.getBuffer();
     }
 #endif