Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index d2f631b..d882de4 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -7,29 +7,23 @@
 #include "simgrid/msg.h"
 #include "instr/instr_interface.h"
 #include "msg_private.h"
-#include "msg_mailbox.h"
 #include "mc/mc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/virtu.h"
-#include "xbt/ex.h"             /* ex_backtrace_display */
-#include "xbt/replay.h"
 #include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
-#include "src/surf/callbacks.h"
-#include "src/surf/platform.hpp"
+#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
-                                "Logging specific to MSG (kernel)");
+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 **************************************/
 
-static void _sg_cfg_cb_msg_debug_multiple_use(const char *name, int pos)
+static void _sg_cfg_cb_msg_debug_multiple_use(const char *name)
 {
-  msg_global->debug_multiple_use = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  msg_global->debug_multiple_use = xbt_cfg_get_boolean(name);
 }
 
 static void MSG_host_create_(sg_host_t host)
@@ -51,10 +45,8 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);
 
-    xbt_cfg_register(&_sg_cfg_set, "msg/debug_multiple_use",
-                     "Print backtraces of both processes when there is a conflict of multiple use of a task",
-                     xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_msg_debug_multiple_use);
-    xbt_cfg_setdefault_boolean(_sg_cfg_set, "msg/debug_multiple_use", "no");
+    xbt_cfg_register_boolean("msg/debug-multiple-use", "no", _sg_cfg_cb_msg_debug_multiple_use,
+        "Print backtraces of both processes when there is a conflict of multiple use of a task");
 
     SIMIX_global_init(argc, argv);
 
@@ -69,6 +61,10 @@ void MSG_init_nocheck(int *argc, char **argv) {
     simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
       MSG_host_create_(&host);
     });
+    MSG_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) {
+      __MSG_host_priv_free((msg_host_priv_t) p);
+    });
+
   }
 
   if(MC_is_active()){
@@ -79,7 +75,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
   XBT_DEBUG("ADD MSG LEVELS");
   MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
   MSG_FILE_LEVEL = xbt_lib_add_level(file_lib, (void_f_pvoid_t) __MSG_file_destroy);
-  if(sg_cfg_get_boolean("clean_atexit")) atexit(MSG_exit);
+  if(xbt_cfg_get_boolean("clean-atexit")) atexit(MSG_exit);
 }
 
 /** \ingroup msg_simulation
@@ -109,10 +105,9 @@ msg_error_t MSG_main(void)
  */
 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);
+  xbt_cfg_set_as_string(key, value);
 }
 
-
 /** \ingroup msg_simulation
  * \brief Kill all running process
 
@@ -141,7 +136,6 @@ static void MSG_exit(void) {
   msg_global = NULL;
 }
 
-
 /** \ingroup msg_simulation
  * \brief A clock (in second).
  */