-/* 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. */
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 **************************************/
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",
msg_global->task_copy_callback = nullptr;
msg_global->process_data_cleanup = nullptr;
+ 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->get_impl()->get_user_data();
+ void* userdata = actor->extension<simgrid::msg::ActorUserData>()->get_user_data();
if (userdata && msg_global->process_data_cleanup) {
msg_global->process_data_cleanup(userdata);
}