Use s4u.

[simgrid.git] / src / msg / msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 06c387f..cf4cda0 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -3,11 +3,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 
-#include "instr/instr_interface.hpp"
 #include "mc/mc.h"
+#include "src/instr/instr_private.hpp"
 #include "src/msg/msg_private.hpp"
 #include <xbt/config.hpp>
 
@@ -51,7 +52,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
     MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
-  if (xbt_cfg_get_boolean("clean-atexit"))
+  if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(MSG_exit);
 }
 
@@ -82,7 +83,7 @@ msg_error_t MSG_main()
  */
 void MSG_config(const char *key, const char *value){
   xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
-  xbt_cfg_set_as_string(key, value);
+  simgrid::config::set_as_string(key, value);
 }
 
 /** \ingroup msg_simulation
@@ -91,8 +92,7 @@ void MSG_config(const char *key, const char *value){
  */
 int MSG_process_killall()
 {
-  simcall_process_killall();
-
+  simgrid::s4u::Actor::kill_all();
   return 0;
 }
 
@@ -100,7 +100,6 @@ static void MSG_exit() {
   if (msg_global==nullptr)
     return;
 
-  TRACE_end();
   delete msg_global;
   msg_global = nullptr;
 }