cleaning the actor twice seems somewhat overplayed

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

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 22dfa7c..9c644ff 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,20 +1,22 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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 "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
-
-#include "mc/mc.h"
 #include "src/instr/instr_private.hpp"
 #include "src/msg/msg_private.hpp"
+#include "src/simix/smx_private.hpp"
 #include <xbt/config.hpp>
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
 
 MSG_Global_t msg_global = nullptr;
+simgrid::xbt::Extension<simgrid::s4u::Actor, simgrid::msg::ActorUserData> simgrid::msg::ActorUserData::EXTENSION_ID;
+
 static void MSG_exit();
 
 /********************************* MSG **************************************/
@@ -31,6 +33,8 @@ void MSG_init_nocheck(int *argc, char **argv) {
   if (not msg_global) {
 
     msg_global = new s_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->debug_multiple_use = false;
     simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use",
@@ -42,8 +46,18 @@ void MSG_init_nocheck(int *argc, char **argv) {
     msg_global->task_copy_callback = nullptr;
     msg_global->process_data_cleanup = nullptr;
 
-    SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
-    SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
+    simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::ActorPtr 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::ActorPtr 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);
+      }
+    });
   }
 
   if(MC_is_active()){