[mc] Remove Process:status_

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index f38cf7b..294ef16 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -9,17 +9,17 @@
 #include <simgrid/simix.h>
 
 #include "mc_base.h"
-#include "../simix/smx_private.h"
-#include "mc/mc_record.h"
-#include "mc/mc_replay.h"
+#include "src/simix/smx_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_replay.h"
 #include "mc/mc.h"
 #include "mc_protocol.h"
 
 #ifdef HAVE_MC
-#include "mc/Process.hpp"
-#include "mc/ModelChecker.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/Server.hpp"
 #include "mc_smx.h"
-#include "mc_server.h"
 #endif
 
 #ifdef HAVE_MC
@@ -43,7 +43,7 @@ void MC_wait_for_requests(void)
 {
 #ifdef HAVE_MC
   if (mc_mode == MC_MODE_SERVER) {
-    MC_server_wait_client(&mc_model_checker->process());
+    simgrid::mc::server->wait_client(mc_model_checker->process());
     return;
   }
 #endif
@@ -233,7 +233,8 @@ void MC_simcall_handle(smx_simcall_t req, int value)
 
   xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) {
     if (req == &pi->copy.simcall) {
-      MC_server_simcall_handle(&mc_model_checker->process(), pi->copy.pid, value);
+      simgrid::mc::server->simcall_handle(
+        mc_model_checker->process(), pi->copy.pid, value);
       return;
     }
   }