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
normalize some type names
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
f764ade
..
0652b7e
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-80,7
+80,7
@@
void MSG_global_init(int *argc, char **argv)
#endif
XBT_DEBUG("ADD MSG LEVELS");
#endif
XBT_DEBUG("ADD MSG LEVELS");
- MSG_HOST_LEVEL = xbt_lib_add_level(host_lib,
free
);
+ MSG_HOST_LEVEL = xbt_lib_add_level(host_lib,
(void_f_pvoid_t) __MSG_host_destroy
);
}
/** \defgroup m_channel_management Understanding channels
}
/** \defgroup m_channel_management Understanding channels
@@
-110,7
+110,7
@@
void MSG_global_init(int *argc, char **argv)
*/
MSG_error_t MSG_set_channel_number(int number)
{
*/
MSG_error_t MSG_set_channel_number(int number)
{
- xbt_assert
0
((msg_global)
+ xbt_assert((msg_global)
&& (msg_global->max_channel == 0),
"Channel number already set!");
&& (msg_global->max_channel == 0),
"Channel number already set!");
@@
-128,7
+128,7
@@
MSG_error_t MSG_set_channel_number(int number)
*/
int MSG_get_channel_number(void)
{
*/
int MSG_get_channel_number(void)
{
- xbt_assert
0
((msg_global)
+ xbt_assert((msg_global)
&& (msg_global->max_channel != 0),
"Channel number not set yet!");
&& (msg_global->max_channel != 0),
"Channel number not set yet!");
@@
-179,21
+179,12
@@
int MSG_process_killall(int reset_PIDs)
MSG_error_t MSG_clean(void)
{
MSG_error_t MSG_clean(void)
{
-// Exit the LIB host_lib
-xbt_lib_free(&host_lib);
-xbt_lib_free(&link_lib);
-xbt_lib_free(&as_router_lib);
-
-
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
MSG_process_killall(0);
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
MSG_process_killall(0);
- free(msg_global);
- msg_global = NULL;
-
/* initialization of the action module */
_MSG_action_exit();
/* initialization of the action module */
_MSG_action_exit();
@@
-203,6
+194,9
@@
xbt_lib_free(&as_router_lib);
SIMIX_clean();
SIMIX_clean();
+ free(msg_global);
+ msg_global = NULL;
+
return MSG_OK;
}
return MSG_OK;
}