#include "instr/instr_interface.h"
#include "mc/mc.h"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
-SG_BEGIN_DECL()
+extern "C" {
MSG_Global_t msg_global = nullptr;
static void MSG_exit();
*/
void MSG_init_nocheck(int *argc, char **argv) {
- TRACE_global_init(argc, argv);
+ TRACE_global_init();
- xbt_getpid = &MSG_process_self_PID;
- if (!msg_global) {
+ if (not msg_global) {
- msg_global = xbt_new0(s_MSG_Global_t, 1);
+ msg_global = new s_MSG_Global_t();
xbt_cfg_register_boolean("msg/debug-multiple-use", "no", _sg_cfg_cb_msg_debug_multiple_use,
"Print backtraces of both processes when there is a conflict of multiple use of a task");
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
- simgrid::s4u::onPlatformCreated.connect(MSG_post_create_environment);
-
simgrid::MsgHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::MsgHostExt>();
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
host.extension_set<simgrid::MsgHostExt>(new simgrid::MsgHostExt());
MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
}
- XBT_DEBUG("ADD MSG LEVELS");
- MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
- if(xbt_cfg_get_boolean("clean-atexit"))
+ if (xbt_cfg_get_boolean("clean-atexit"))
atexit(MSG_exit);
}
if (msg_global==nullptr)
return;
- TRACE_surf_resource_utilization_release();
TRACE_end();
- free(msg_global);
+ delete msg_global;
msg_global = nullptr;
}
{
return msg_global->sent_msg;
}
-
-SG_END_DECL()
+}