X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2945198502e436f29236715c0baca1efadb64480..9692d43fa911bdc2d6d0263a3cb3e22d5e3167fe:/src/mc/mc_global.cpp

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 8cd7f9f7a5..c4b23fef33 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -27,7 +27,7 @@
 #include <sys/time.h>
 #endif
 
-#include "src/simix/smx_process_private.h"
+#include "src/simix/ActorImpl.hpp"
 
 #if HAVE_MC
 #include <libunwind.h>
@@ -48,8 +48,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
 
-e_mc_mode_t mc_mode;
-
 namespace simgrid {
 namespace mc {
 
@@ -74,7 +72,7 @@ xbt_automaton_t property_automaton = nullptr;
 FILE *dot_output = nullptr;
 
 
-/*******************************  Initialisation of MC *******************************/
+/*******************************  Initialization of MC *******************************/
 /*********************************************************************************/
 
 void MC_init_dot_output()
@@ -96,10 +94,10 @@ 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;
+  smx_actor_t process;
   xbt_swag_foreach(process, simix_global->process_list)
     MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup));
   simgrid::mc::Client::get()->mainLoop();
@@ -139,7 +137,7 @@ void dumpStack(FILE* file, unw_cursor_t cursor)
 
     int status;
 
-    // Demangle C++ names:
+    // Unmangle C++ names:
     char* realname = abi::__cxa_demangle(name, 0, 0, &status);
 
 #if defined(__x86_64__)
@@ -169,7 +167,7 @@ static void MC_dump_stacks(FILE* file)
 
     simgrid::mc::UnwindContext context;
     unw_context_t raw_context =
-      mc_model_checker->process().read<unw_context_t>(
+      (unw_context_t) mc_model_checker->process().read<unw_context_t>(
         simgrid::mc::remote((unw_context_t *)stack.context));
     context.initialize(&mc_model_checker->process(), &raw_context);
 
@@ -179,7 +177,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;
@@ -188,7 +186,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;
 }