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
Merge pull request #202 from Takishipp/clear_fct
[simgrid.git]
/
src
/
msg
/
msg_global.cpp
diff --git
a/src/msg/msg_global.cpp
b/src/msg/msg_global.cpp
index
a75e536
..
4a0509d
100644
(file)
--- a/
src/msg/msg_global.cpp
+++ b/
src/msg/msg_global.cpp
@@
-9,7
+9,6
@@
#include "instr/instr_interface.h"
#include "mc/mc.h"
#include "src/msg/msg_private.h"
#include "instr/instr_interface.h"
#include "mc/mc.h"
#include "src/msg/msg_private.h"
-#include "src/mc/mc_ignore.h"
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
@@
-33,10
+32,9
@@
static void _sg_cfg_cb_msg_debug_multiple_use(const char *name)
*/
void MSG_init_nocheck(int *argc, char **argv) {
*/
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 = new s_MSG_Global_t();
msg_global = new s_MSG_Global_t();
@@
-52,8
+50,6
@@
void MSG_init_nocheck(int *argc, char **argv) {
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
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());
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());
@@
-65,9
+61,7
@@
void MSG_init_nocheck(int *argc, char **argv) {
MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
}
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);
}
atexit(MSG_exit);
}