-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2021. 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 <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;
+bool MSG_Global_t::debug_multiple_use = false;
+
+MSG_Global_t* msg_global = nullptr;
+
static void MSG_exit();
/********************************* MSG **************************************/
* @brief Initialize MSG with less verifications
* You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned.
*/
-void MSG_init_nocheck(int *argc, char **argv) {
-
- TRACE_global_init();
+void MSG_init_nocheck(int* argc, char** argv)
+{
+ simgrid::instr::init();
if (not msg_global) {
-
- msg_global = new s_MSG_Global_t();
-
- msg_global->debug_multiple_use = false;
- simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use",
+ simgrid::config::bind_flag(MSG_Global_t::debug_multiple_use, "msg/debug-multiple-use",
"Print backtraces of both processes when there is a conflict of multiple use of a task");
SIMIX_global_init(argc, argv);
+ msg_global = new MSG_Global_t();
+
msg_global->sent_msg = 0;
msg_global->task_copy_callback = nullptr;
msg_global->process_data_cleanup = nullptr;
-
- simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) {
+ simgrid::s4u::Actor::on_termination.connect([](simgrid::s4u::Actor const& actor) {
// free the data if a function was provided
- void* userdata = actor->get_impl()->get_user_data();
- if (userdata && msg_global->process_data_cleanup) {
+ void* userdata = sg_actor_get_data(&actor);
+ if (userdata && msg_global->process_data_cleanup)
msg_global->process_data_cleanup(userdata);
- }
});
}
if(MC_is_active()){
/* Ignore total amount of messages sent during the simulation for heap comparison */
- MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
+ 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);
}
-void MSG_config(const char *key, const char *value){
+void MSG_config(const char* key, const char* value)
+{
xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
simgrid::config::set_as_string(key, value);
}
-static void MSG_exit() {
+static void MSG_exit()
+{
delete msg_global;
msg_global = nullptr;
}