Deprecate MSG_clean

[simgrid.git] / src / msg / msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index dc424fc..e30aa38 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -18,6 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
                                 "Logging specific to MSG (kernel)");
 
 MSG_Global_t msg_global = NULL;
+static void MSG_exit(void);
 
 /********************************* MSG **************************************/
 
@@ -38,6 +39,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
@@ -49,11 +53,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
     msg_global->process_data_cleanup = NULL;
     msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
 
-    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));
-    }
-
     /* initialization of the action module */
     _MSG_action_init();
 
@@ -62,12 +61,20 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
     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
 
   XBT_DEBUG("ADD MSG LEVELS");
   MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
+
+  atexit(MSG_exit);
 }
 
 #ifdef MSG_USE_DEPRECATED
@@ -144,10 +151,13 @@ int MSG_process_killall(int reset_PIDs)
 }
 
 /** \ingroup msg_simulation
- * \brief Clean the MSG simulation
+ * \brief Clean the MSG simulation.
+ *
+ * This function is called automatically when the system process stops, so I guess that calling it manually is useless nowadays.
  */
-msg_error_t MSG_clean(void)
-{
+static void MSG_exit(void) {
+  if (msg_global==NULL)
+    return;
   XBT_DEBUG("Closing MSG");
 
 #ifdef HAVE_TRACING
@@ -163,13 +173,9 @@ msg_error_t MSG_clean(void)
   TRACE_end();
 #endif
 
-  SIMIX_clean();
-
   xbt_swag_free(msg_global->vms);
   free(msg_global);
   msg_global = NULL;
-
-  return MSG_OK;
 }
 
 
@@ -185,3 +191,9 @@ unsigned long int MSG_get_sent_msg()
 {
   return msg_global->sent_msg;
 }
+
+#ifdef MSG_USE_DEPRECATED
+msg_error_t MSG_clean(void) {
+  return MSG_OK;
+}
+#endif