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
[trace] new tracing option to disable the topology tracing as a graph
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
e30aa38
..
81abae0
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-38,9
+38,6
@@
void MSG_init_nocheck(int *argc, char **argv) {
s_msg_vm_t vm; // to compute the offset
SIMIX_global_init(argc, argv);
s_msg_vm_t vm; // to compute the offset
SIMIX_global_init(argc, argv);
-
- if(MC_IS_ENABLED && mmalloc_ignore == NULL)
- MC_ignore_init();
msg_global = xbt_new0(s_MSG_Global_t, 1);
msg_global = xbt_new0(s_MSG_Global_t, 1);
@@
-62,9
+59,9
@@
void MSG_init_nocheck(int *argc, char **argv) {
sg_platf_postparse_add_cb(MSG_post_create_environment);
}
sg_platf_postparse_add_cb(MSG_post_create_environment);
}
- if(MC_
IS_ENABLED
){
+ if(MC_
is_active()
){
/* Ignore total amount of messages sent during the simulation for heap comparison */
/* Ignore total amount of messages sent during the simulation for heap comparison */
- MC_ignore(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
+ MC_ignore
_heap
(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
}
#ifdef HAVE_TRACING
}
#ifdef HAVE_TRACING
@@
-122,7
+119,7
@@
msg_error_t MSG_main(void)
fflush(stdout);
fflush(stderr);
fflush(stdout);
fflush(stderr);
- if (MC_
IS_ENABLED) {
+ if (MC_
is_active()) {
MC_do_the_modelcheck_for_real();
} else {
SIMIX_run();
MC_do_the_modelcheck_for_real();
} else {
SIMIX_run();
@@
-150,22
+147,14
@@
int MSG_process_killall(int reset_PIDs)
}
}
-/** \ingroup msg_simulation
- * \brief Clean the MSG simulation.
- *
- * This function is called automatically when the system process stops, so I guess that calling it manually is useless nowadays.
- */
static void MSG_exit(void) {
if (msg_global==NULL)
return;
static void MSG_exit(void) {
if (msg_global==NULL)
return;
- XBT_DEBUG("Closing MSG");
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
- MSG_process_killall(0);
-
/* initialization of the action module */
_MSG_action_exit();
/* initialization of the action module */
_MSG_action_exit();