X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b3b5bd763d386fdf2f64236790cf86d1f3fd828..04d3d36e9e87d194bee4f88859f96d66975cce31:/src/msg/msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 3f4d5431af..aad562018c 100644
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -8,12 +8,12 @@
 
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
 
-SG_BEGIN_DECL()
+extern "C" {
 
 MSG_Global_t msg_global = nullptr;
 static void MSG_exit();
@@ -32,9 +32,8 @@ static void _sg_cfg_cb_msg_debug_multiple_use(const char *name)
  */
 void MSG_init_nocheck(int *argc, char **argv) {
 
-  TRACE_global_init(argc, argv);
+  TRACE_global_init();
 
-  xbt_getpid = &MSG_process_self_PID;
   if (not msg_global) {
 
     msg_global = new s_MSG_Global_t();
@@ -50,13 +49,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
-
-    simgrid::s4u::onPlatformCreated.connect(MSG_post_create_environment);
-
-    simgrid::MsgHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::MsgHostExt>();
-    simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
-      host.extension_set<simgrid::MsgHostExt>(new simgrid::MsgHostExt());
-    });
   }
 
   if(MC_is_active()){
@@ -64,9 +56,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
     MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
-  XBT_DEBUG("ADD MSG LEVELS");
-  MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
-  if(xbt_cfg_get_boolean("clean-atexit"))
+  if (xbt_cfg_get_boolean("clean-atexit"))
     atexit(MSG_exit);
 }
 
@@ -118,7 +108,6 @@ static void MSG_exit() {
   if (msg_global==nullptr)
     return;
 
-  TRACE_surf_resource_utilization_release();
   TRACE_end();
   delete msg_global;
   msg_global = nullptr;
@@ -136,5 +125,4 @@ unsigned long int MSG_get_sent_msg()
 {
   return msg_global->sent_msg;
 }
-
-SG_END_DECL()
+}