move the synchronization stuff to its own directory

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 708f3c5..01eee91 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -6,8 +6,6 @@
 
 #include <cassert>
 
-#include <algorithm>
-
 #include <simgrid_config.h>
 
 #include <xbt/log.h>
@@ -22,12 +20,12 @@
 #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"
+#include "src/synchro/Synchro.h"
+#include "src/synchro/SynchroIo.hpp"
+#include "src/synchro/SynchroComm.hpp"
+#include "src/synchro/SynchroRaw.hpp"
+#include "src/synchro/SynchroSleep.hpp"
+#include "src/synchro/SynchroExec.hpp"
 
 #if HAVE_MC
 #include "src/mc/mc_request.h"
@@ -164,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