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
try a bit harder to get the simulated time without any function call
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
f874911
..
46f25b5
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;
@@
-70,9
+70,6
@@
void MSG_global_init(int *argc, char **argv)
msg_global->PID = 1;
msg_global->sent_msg = 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();
@@
-80,6
+77,9
@@
void MSG_global_init(int *argc, char **argv)
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
}
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
}
+#ifdef HAVE_TRACING
+ TRACE_start();
+#endif
}
/** \defgroup m_channel_management Understanding channels
}
/** \defgroup m_channel_management Understanding channels
@@
-142,15
+142,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;
}
@@
-190,7
+188,7
@@
MSG_error_t MSG_clean(void)
m_process_t p = NULL;
#ifdef HAVE_TRACING
m_process_t p = NULL;
#ifdef HAVE_TRACING
- TRACE_surf_
finaliz
e();
+ TRACE_surf_
releas
e();
#endif
while ((p = xbt_fifo_pop(msg_global->process_list))) {
#endif
while ((p = xbt_fifo_pop(msg_global->process_list))) {
@@
-206,12
+204,13
@@
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();
-
/* initialization of the action module */
_MSG_action_exit();
/* initialization of the action module */
_MSG_action_exit();
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
SIMIX_clean();
return MSG_OK;
SIMIX_clean();
return MSG_OK;
@@
-221,7
+220,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();
}