A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
d6cb7f8
..
9c644ff
100644
(file)
--- a/
src/msg/msg_global.cpp
+++ b/
src/msg/msg_global.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
9
. 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. */
/* 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. */
@@
-15,6
+15,8
@@
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;
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 **************************************/
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 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->debug_multiple_use = false;
simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use",
@@
-42,9
+46,14
@@
void MSG_init_nocheck(int *argc, char **argv) {
msg_global->task_copy_callback = nullptr;
msg_global->process_data_cleanup = nullptr;
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
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);
}
if (userdata && msg_global->process_data_cleanup) {
msg_global->process_data_cleanup(userdata);
}