X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3203ed1f4fb6f4617e94d5351661ba07e8b8f833..443652142305f56d1e13e904ba74d04b9cfeb3da:/src/simgrid/sg_config.c

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 624b6d8b21..a36c0a2f3b 100644
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -27,7 +27,7 @@
 #include "src/mc/mc_replay.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
-                                "About the configuration of simgrid");
+                                "About the configuration of SimGrid");
 
 xbt_cfg_t _sg_cfg_set = NULL;
 
@@ -374,21 +374,15 @@ extern int _sg_do_model_check;   /* this variable lives in xbt_main until I find
 extern int _sg_do_model_check_record;
 #endif
 
-static void _sg_cfg_cb_model_check_replay(const char *name, int pos)
-{
+static void _sg_cfg_cb_model_check_replay(const char *name, int pos) {
   MC_record_path = xbt_cfg_get_string(_sg_cfg_set, name);
 }
 
-static void _sg_cfg_cb_model_check_record(const char *name, int pos)
-{
 #ifdef HAVE_MC
+static void _sg_cfg_cb_model_check_record(const char *name, int pos) {
   _sg_do_model_check_record = xbt_cfg_get_boolean(_sg_cfg_set, name);
-#else
-  if (xbt_cfg_get_boolean(_sg_cfg_set, name)) {
-    xbt_die("You tried to activate the model-checking record from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again");
-  }
-#endif
 }
+#endif
 
 extern int _sg_do_verbose_exit;
 
@@ -456,7 +450,7 @@ static void _sg_cfg_cb__surf_network_coordinates(const char *name,
   int val = xbt_cfg_get_boolean(_sg_cfg_set, name);
   if (val) {
     if (!already_set) {
-      COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+      COORD_HOST_LEVEL = sg_host_extension_create(xbt_dynar_free_voidp);
       COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
     }
     already_set = 1;
@@ -600,7 +594,7 @@ void sg_config_init(int *argc, char **argv)
                      xbt_cfgelm_boolean, 1, 1, NULL, NULL);
     xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/maxmin_selective_update", "no");
 
-    /* Replay (this part is enabled event if MC it disabled) */
+    /* Replay (this part is enabled even if MC it disabled) */
     xbt_cfg_register(&_sg_cfg_set, "model-check/replay",
       "Uenable replay mode with the given path",
       xbt_cfgelm_string, 0, 1, _sg_cfg_cb_model_check_replay, NULL);
@@ -837,10 +831,10 @@ void sg_config_init(int *argc, char **argv)
                      xbt_cfgelm_double, 1, 1, NULL, NULL);
     xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/cpu_threshold", 1e-6);
 
-    xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thres",
+    xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thresh",
                      "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver",
                      xbt_cfgelm_int, 1, 1, NULL, NULL);
-    xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/async_small_thres", 0);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/async_small_thresh", 0);
 
     xbt_cfg_register(&_sg_cfg_set, "smpi/send_is_detached_thres",
                      "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend",