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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into...
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
879461f
..
5aef61a
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-21,8
+21,9
@@
MSG_Global_t msg_global = NULL;
/********************************* MSG **************************************/
/********************************* MSG **************************************/
-/* @brief Initialize MSG with less verifications
- *
+/**
+ * \ingroup msg_simulation
+ * \brief Initialize MSG with less verifications
* You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned.
*/
void MSG_init_nocheck(int *argc, char **argv) {
* You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned.
*/
void MSG_init_nocheck(int *argc, char **argv) {
@@
-37,6
+38,9
@@
void MSG_init_nocheck(int *argc, char **argv) {
SIMIX_global_init(argc, argv);
SIMIX_global_init(argc, argv);
+ if(MC_IS_ENABLED && mmalloc_ignore == NULL)
+ MC_ignore_init();
+
msg_global = xbt_new0(s_MSG_Global_t, 1);
#ifdef MSG_USE_DEPRECATED
msg_global = xbt_new0(s_MSG_Global_t, 1);
#ifdef MSG_USE_DEPRECATED
@@
-53,8
+57,15
@@
void MSG_init_nocheck(int *argc, char **argv) {
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_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);
+
+ sg_platf_postparse_add_cb(MSG_post_create_environment);
+ }
+
+ if(MC_IS_ENABLED){
+ /* Ignore total amount of messages sent during the simulation for heap comparison */
+ MC_ignore(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
}
}
+
#ifdef HAVE_TRACING
TRACE_start();
#endif
#ifdef HAVE_TRACING
TRACE_start();
#endif
@@
-72,7
+83,7
@@
void MSG_init_nocheck(int *argc, char **argv) {
parameter.
* \param number the number of channel in the simulation. It has to be >0
*/
parameter.
* \param number the number of channel in the simulation. It has to be >0
*/
-
MSG
_error_t MSG_set_channel_number(int number)
+
msg
_error_t MSG_set_channel_number(int number)
{
XBT_WARN("DEPRECATED! Please use aliases instead");
xbt_assert((msg_global)
{
XBT_WARN("DEPRECATED! Please use aliases instead");
xbt_assert((msg_global)
@@
-102,32
+113,15
@@
int MSG_get_channel_number(void)
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
-MSG_error_t MSG_main(void)
-{
- /* Clean IO before the run */
- fflush(stdout);
- fflush(stderr);
-
- if (MC_IS_ENABLED) {
- MC_modelcheck();
- }
- else {
- SIMIX_run();
- }
- return MSG_OK;
-}
-
-
-MSG_error_t MSG_main_liveness(xbt_automaton_t a)
+msg_error_t MSG_main(void)
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
- if (MC_IS_ENABLED) {
- MC_modelcheck_liveness(a);
- }
- else {
+ if (MC_IS_ENABLED) {
+ MC_do_the_modelcheck_for_real();
+ } else {
SIMIX_run();
}
return MSG_OK;
SIMIX_run();
}
return MSG_OK;
@@
-156,7
+150,7
@@
int MSG_process_killall(int reset_PIDs)
/** \ingroup msg_simulation
* \brief Clean the MSG simulation
*/
/** \ingroup msg_simulation
* \brief Clean the MSG simulation
*/
-
MSG
_error_t MSG_clean(void)
+
msg
_error_t MSG_clean(void)
{
XBT_DEBUG("Closing MSG");
{
XBT_DEBUG("Closing MSG");