X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55b17883ef3f90e6d5899e321610d6716e2d0928..3880093b08b4663a22f6ea9c35e7dfa7248a5491:/src/msg/msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 5b6713b18f..e061e0c500 100644
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -39,25 +39,11 @@ void MSG_init_nocheck(int *argc, char **argv) {
     SIMIX_global_init(argc, argv);
 
     msg_global = new MSG_Global_t();
-    if (not simgrid::msg::ActorUserData::EXTENSION_ID.valid())
-      simgrid::msg::ActorUserData::EXTENSION_ID = simgrid::s4u::Actor::extension_create<simgrid::msg::ActorUserData>();
 
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = nullptr;
     msg_global->process_data_cleanup = nullptr;
-
-    simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::Actor& actor) {
-      XBT_DEBUG("creating the extension to store user data");
-      actor.extension_set(new simgrid::msg::ActorUserData());
-    });
-
-    simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::Actor const& actor) {
-      // free the data if a function was provided
-      void* userdata = actor.extension<simgrid::msg::ActorUserData>()->get_user_data();
-      if (userdata && msg_global->process_data_cleanup) {
-        msg_global->process_data_cleanup(userdata);
-      }
-    });
+    MSG_process_userdata_init();
   }
 
   if(MC_is_active()){
@@ -65,7 +51,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
     MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
-  if (simgrid::config::get_value<bool>("clean-atexit"))
+  if (simgrid::config::get_value<bool>("debug/clean-atexit"))
     atexit(MSG_exit);
 }