X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/821e14387201136b86389d5ea0bdc6c2fb4f0b10..d947ff7466b473eeec602007934f8336a9b17f3c:/src/msg/msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 5e10842147..f40bf21962 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2012. The SimGrid Team.  All rights reserved.         */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "instr/instr_interface.h"
 #include "msg_private.h"
 #include "msg_mailbox.h"
 #include "mc/mc.h"
@@ -12,12 +12,15 @@
 #include "xbt/virtu.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "xbt/replay.h"
+#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 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 **************************************/
 
@@ -37,9 +40,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
     s_msg_vm_t vm; // to compute the offset
 
     SIMIX_global_init(argc, argv);
-
-    if(MC_IS_ENABLED && mmalloc_ignore == NULL)
-      MC_ignore_init();
     
     msg_global = xbt_new0(s_MSG_Global_t, 1);
 
@@ -61,9 +61,9 @@ void MSG_init_nocheck(int *argc, char **argv) {
     sg_platf_postparse_add_cb(MSG_post_create_environment);
   }
   
-  if(MC_IS_ENABLED){
+  if(MC_is_active()){
     /* Ignore total amount of messages sent during the simulation for heap comparison */
-    MC_ignore(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
+    MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
 #ifdef HAVE_TRACING
@@ -72,6 +72,8 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
   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
@@ -119,7 +121,7 @@ msg_error_t MSG_main(void)
   fflush(stdout);
   fflush(stderr);
 
-  if (MC_IS_ENABLED) { 
+  if (MC_is_active()) {
     MC_do_the_modelcheck_for_real();
   } else {
     SIMIX_run();
@@ -127,6 +129,20 @@ msg_error_t MSG_main(void)
   return MSG_OK;
 }
 
+/** \ingroup msg_simulation
+ * \brief set a configuration variable
+ *
+ * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options.
+ *
+ * Example:
+ * MSG_config("workstation/model","KCCFLN05");
+ */
+void MSG_config(const char *key, const char *value){
+  xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
+  xbt_cfg_set_as_string(_sg_cfg_set, key, value);
+}
+
+
 /** \ingroup msg_simulation
  * \brief Kill all running process
 
@@ -147,19 +163,14 @@ int MSG_process_killall(int reset_PIDs)
 
 }
 
-/** \ingroup msg_simulation
- * \brief Clean the MSG simulation
- */
-msg_error_t MSG_clean(void)
-{
-  XBT_DEBUG("Closing MSG");
+static void MSG_exit(void) {
+  if (msg_global==NULL)
+    return;
 
 #ifdef HAVE_TRACING
-  TRACE_surf_release();
+  TRACE_surf_resource_utilization_release();
 #endif
 
-  MSG_process_killall(0);
-
   /* initialization of the action module */
   _MSG_action_exit();
 
@@ -170,8 +181,6 @@ msg_error_t MSG_clean(void)
   xbt_swag_free(msg_global->vms);
   free(msg_global);
   msg_global = NULL;
-
-  return MSG_OK;
 }
 
 
@@ -187,3 +196,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