X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc48db087894fd960073b3120cebf90e6b2f8c02..d99d3238efb76357fcc6437c15fb900c3c02ebd4:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index b48faf5a04..6e71f22486 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -21,7 +21,7 @@
 #if HAVE_MC
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_protocol.h"
-#include "src/mc/mc_client.h"
+#include "src/mc/Client.hpp"
 
 #include <stdlib.h>
 #include "src/mc/mc_protocol.h"
@@ -230,8 +230,6 @@ void SIMIX_global_init(int *argc, char **argv)
     __xbt_running_ctx_fetch = SIMIX_process_get_running_context;
     __xbt_ex_terminate = SIMIX_process_exception_terminate;
 
-    SIMIX_network_init();
-
     /* Prepare to display some more info when dying on Ctrl-C pressing */
     signal(SIGINT, inthandler);
 
@@ -260,13 +258,13 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_timers = xbt_heap_new(8, &free);
   }
 
-  if (sg_cfg_get_boolean("clean_atexit"))
+  if (xbt_cfg_get_boolean("clean_atexit"))
     atexit(SIMIX_clean);
 
 #if HAVE_MC
   // The communication initialization is done ASAP.
   // We need to communicate  initialization of the different layers to the model-checker.
-  MC_client_init();
+  simgrid::mc::Client::initialize();
 #endif
 
   if (_sg_cfg_exit_asap)
@@ -298,7 +296,7 @@ void SIMIX_clean(void)
   SIMIX_process_killall(simix_global->maestro_process, 1);
 
   /* Exit the SIMIX network module */
-  SIMIX_network_exit();
+  SIMIX_mailbox_exit();
 
   xbt_heap_free(simix_timers);
   simix_timers = NULL;
@@ -380,9 +378,8 @@ static int process_syscall_color(void *p)
  */
 void SIMIX_run(void)
 {
-  if(MC_record_path) {
-    MC_record_replay_init();
-    MC_record_replay_from_string(MC_record_path);
+  if (MC_record_path) {
+    simgrid::mc::replay(MC_record_path);
     return;
   }