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
Do connect all log channel manually to parent using XBT_LOG_CONNECT() too, so that...
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
3436087
..
565788c
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-12,6
+12,7
@@
#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/ex.h" /* ex_backtrace_display */
+#include "mailbox.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
"Logging specific to MSG (kernel)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
"Logging specific to MSG (kernel)");
@@
-45,6
+46,12
@@
void MSG_global_init(int *argc, char **argv)
{
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
{
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
+ /* Connect our log channels: that must be done manually under windows */
+ XBT_LOG_CONNECT(msg_gos, msg);
+ XBT_LOG_CONNECT(msg_kernel, msg);
+ XBT_LOG_CONNECT(msg_mailbox, msg);
+ XBT_LOG_CONNECT(msg_process, msg);
+
SIMIX_global_init(argc, argv);
msg_global = xbt_new0(s_MSG_Global_t, 1);
SIMIX_global_init(argc, argv);
msg_global = xbt_new0(s_MSG_Global_t, 1);
@@
-54,6
+61,9
@@
void MSG_global_init(int *argc, char **argv)
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->max_channel = 0;
msg_global->PID = 1;
+ /* initialization of the mailbox module */
+ MSG_mailbox_mod_init();
+
SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
@@
-232,8
+242,14
@@
MSG_error_t MSG_clean(void)
free(msg_global);
msg_global = NULL;
free(msg_global);
msg_global = NULL;
+
+ /* cleanup all resources in the mailbox module */
+ MSG_mailbox_mod_exit();
+
SIMIX_clean();
SIMIX_clean();
+
+
return MSG_OK;
}
return MSG_OK;
}