X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2a013c0e4ca407feeb7b3d0e85abba7acae2532..648a27ac5171a4e9fa142617ff7104aae77be888:/src/mc/mc_global.cpp

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index aaae1d47a1..e62b9c659f 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -38,13 +38,13 @@
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_unw.h"
 #include "src/mc/mc_smx.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #endif
 
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
 #include "src/mc/Transition.hpp"
+#include "src/mc/mc_record.h"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
 
@@ -94,12 +94,13 @@ void MC_init_dot_output()
 
 void MC_run()
 {
-  simgrid::mc::processes_time.resize(simix_process_maxpid);
+  simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
   MC_ignore_heap(simgrid::mc::processes_time.data(),
     simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
-  smx_process_t process;
-  xbt_swag_foreach(process, simix_global->process_list)
-    MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup));
+  for (auto kv : simix_global->process_list) {
+    smx_actor_t actor = kv.second;
+    MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
+  }
   simgrid::mc::Client::get()->mainLoop();
   simgrid::mc::processes_time.clear();
 }
@@ -177,7 +178,7 @@ static void MC_dump_stacks(FILE* file)
 }
 #endif
 
-double MC_process_clock_get(smx_process_t process)
+double MC_process_clock_get(smx_actor_t process)
 {
   if (simgrid::mc::processes_time.empty())
     return 0;
@@ -186,7 +187,7 @@ double MC_process_clock_get(smx_process_t process)
   return -1;
 }
 
-void MC_process_clock_add(smx_process_t process, double amount)
+void MC_process_clock_add(smx_actor_t process, double amount)
 {
   simgrid::mc::processes_time[process->pid] += amount;
 }