X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370..56fd6af5b42030d3b9e5ef6fc5f3632961a9db90:/src/msg/msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 879461fd2e..5aef61aa2a 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -21,8 +21,9 @@ MSG_Global_t msg_global = NULL;
 
 /********************************* 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) {
@@ -37,6 +38,9 @@ void MSG_init_nocheck(int *argc, char **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
@@ -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_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
@@ -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
  */
-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)
@@ -102,32 +113,15 @@ int MSG_get_channel_number(void)
 /** \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);
 
-  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;
@@ -156,7 +150,7 @@ int MSG_process_killall(int reset_PIDs)
 /** \ingroup msg_simulation
  * \brief Clean the MSG simulation
  */
-MSG_error_t MSG_clean(void)
+msg_error_t MSG_clean(void)
 {
   XBT_DEBUG("Closing MSG");