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
Updated example against newest API.
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
f874911
..
6aa780d
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-49,7
+49,7
@@
XBT_LOG_EXTERNAL_CATEGORY(msg_process);
void MSG_global_init(int *argc, char **argv)
{
#ifdef HAVE_TRACING
void MSG_global_init(int *argc, char **argv)
{
#ifdef HAVE_TRACING
- TRACE_global_init
(argc, argv);
+ TRACE_global_init(argc, argv);
#endif
xbt_getpid = MSG_process_self_PID;
#endif
xbt_getpid = MSG_process_self_PID;
@@
-64,22
+64,23
@@
void MSG_global_init(int *argc, char **argv)
msg_global = xbt_new0(s_MSG_Global_t, 1);
msg_global = xbt_new0(s_MSG_Global_t, 1);
- msg_global->host = xbt_fifo_new();
- msg_global->process_list = xbt_fifo_new();
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
- /* initialization of the mailbox module */
- MSG_mailbox_mod_init();
-
/* initialization of the action module */
_MSG_action_init();
/* initialization of the action module */
_MSG_action_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_from_SIMIX
);
+ SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX);
}
}
+#ifdef HAVE_TRACING
+ TRACE_start();
+#endif
+
+ XBT_DEBUG("ADD MSG LEVELS");
+ MSG_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
}
/** \defgroup m_channel_management Understanding channels
}
/** \defgroup m_channel_management Understanding channels
@@
-109,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!");
@@
-127,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!");
@@
-142,15
+143,13
@@
MSG_error_t MSG_main(void)
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
- SIMIX_init();
-#ifdef HAVE_MC
- if (_surf_do_model_check)
- MC_modelcheck(1);
- else
-#endif
- while (SIMIX_solve(NULL, NULL) != -1.0);
-
+ if (MC_IS_ENABLED) {
+ MC_modelcheck();
+ }
+ else {
+ SIMIX_run();
+ }
return MSG_OK;
}
return MSG_OK;
}
@@
-163,13
+162,7
@@
MSG_error_t MSG_main(void)
*/
int MSG_process_killall(int reset_PIDs)
{
*/
int MSG_process_killall(int reset_PIDs)
{
- m_process_t p = NULL;
- m_process_t self = MSG_process_self();
-
- while ((p = xbt_fifo_pop(msg_global->process_list))) {
- if (p != self)
- MSG_process_kill(p);
- }
+ SIMIX_req_process_killall();
if (reset_PIDs > 0) {
msg_global->PID = reset_PIDs;
if (reset_PIDs > 0) {
msg_global->PID = reset_PIDs;
@@
-185,35
+178,30
@@
int MSG_process_killall(int reset_PIDs)
*/
MSG_error_t MSG_clean(void)
{
*/
MSG_error_t MSG_clean(void)
{
- xbt_fifo_item_t i = NULL;
- m_host_t h = NULL;
- m_process_t p = NULL;
#ifdef HAVE_TRACING
#ifdef HAVE_TRACING
- TRACE_surf_
finaliz
e();
+ TRACE_surf_
releas
e();
#endif
#endif
- while ((p = xbt_fifo_pop(msg_global->process_list))) {
- MSG_process_kill(p);
- }
-
- xbt_fifo_foreach(msg_global->host, i, h, m_host_t) {
- __MSG_host_destroy(h);
- }
- xbt_fifo_free(msg_global->host);
- xbt_fifo_free(msg_global->process_list);
+ MSG_process_killall(0);
free(msg_global);
msg_global = NULL;
free(msg_global);
msg_global = NULL;
- /* cleanup all resources in the mailbox module */
- MSG_mailbox_mod_exit();
-
/* initialization of the action module */
_MSG_action_exit();
/* initialization of the action module */
_MSG_action_exit();
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
SIMIX_clean();
SIMIX_clean();
+ // Exit the LIB host_lib
+ xbt_lib_free(&host_lib);
+ xbt_lib_free(&link_lib);
+ xbt_lib_free(&as_router_lib);
+
return MSG_OK;
}
return MSG_OK;
}
@@
-221,7
+209,7
@@
MSG_error_t MSG_clean(void)
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
-double MSG_get_clock(void)
+
XBT_INLINE
double MSG_get_clock(void)
{
return SIMIX_get_clock();
}
{
return SIMIX_get_clock();
}