#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)");
bool MSG_Global_t::debug_multiple_use = false;
MSG_Global_t* msg_global = nullptr;
-simgrid::xbt::Extension<simgrid::s4u::Actor, simgrid::msg::ActorUserData> simgrid::msg::ActorUserData::EXTENSION_ID;
static void MSG_exit();
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) {
+ simgrid::s4u::Actor::on_termination.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) {
+ void* userdata = sg_actor_data(&actor);
+ if (userdata && msg_global->process_data_cleanup)
msg_global->process_data_cleanup(userdata);
- }
});
}
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);
}