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
model-checker : use XBT_DEBUG instead of XBT_INFO
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
eb807e6
..
81abae0
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-18,6
+18,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
"Logging specific to MSG (kernel)");
MSG_Global_t msg_global = NULL;
"Logging specific to MSG (kernel)");
MSG_Global_t msg_global = NULL;
+static void MSG_exit(void);
/********************************* MSG **************************************/
/********************************* MSG **************************************/
@@
-37,7
+38,7
@@
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);
-
+
msg_global = xbt_new0(s_MSG_Global_t, 1);
#ifdef MSG_USE_DEPRECATED
msg_global = xbt_new0(s_MSG_Global_t, 1);
#ifdef MSG_USE_DEPRECATED
@@
-54,14
+55,23
@@
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);
- SIMIX_function_register_process_kill(MSG_process_kill);
+
+ sg_platf_postparse_add_cb(MSG_post_create_environment);
+ }
+
+ 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));
}
}
+
#ifdef HAVE_TRACING
TRACE_start();
#endif
XBT_DEBUG("ADD MSG LEVELS");
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
#ifdef HAVE_TRACING
TRACE_start();
#endif
XBT_DEBUG("ADD MSG LEVELS");
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
+
+ atexit(MSG_exit);
}
#ifdef MSG_USE_DEPRECATED
}
#ifdef MSG_USE_DEPRECATED
@@
-109,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();
@@
-137,19
+147,14
@@
int MSG_process_killall(int reset_PIDs)
}
}
-/** \ingroup msg_simulation
- * \brief Clean the MSG simulation
- */
-msg_error_t MSG_clean(void)
-{
- XBT_DEBUG("Closing MSG");
+static void MSG_exit(void) {
+ if (msg_global==NULL)
+ return;
#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();
@@
-157,13
+162,9
@@
msg_error_t MSG_clean(void)
TRACE_end();
#endif
TRACE_end();
#endif
- SIMIX_clean();
-
xbt_swag_free(msg_global->vms);
free(msg_global);
msg_global = NULL;
xbt_swag_free(msg_global->vms);
free(msg_global);
msg_global = NULL;
-
- return MSG_OK;
}
}
@@
-179,3
+180,9
@@
unsigned long int MSG_get_sent_msg()
{
return msg_global->sent_msg;
}
{
return msg_global->sent_msg;
}
+
+#ifdef MSG_USE_DEPRECATED
+msg_error_t MSG_clean(void) {
+ return MSG_OK;
+}
+#endif