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
[trace] merging instr_variables.c into instr_interface.c (code re-organization)
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
7629d66
..
46f25b5
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-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();
@@
-145,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;
}
@@
-209,18
+204,15
@@
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();
- SIMIX_clean();
-
#ifdef HAVE_TRACING
TRACE_end();
#endif
#ifdef HAVE_TRACING
TRACE_end();
#endif
+ SIMIX_clean();
+
return MSG_OK;
}
return MSG_OK;
}
@@
-228,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();
}