X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40cf34da0ddd264f8c3b8220f683de617809d464..2db7ca916c24c9f6da047de60550dda47690e572:/src/xbt/config.c

diff --git a/src/xbt/config.c b/src/xbt/config.c
index e5d71a48c1..1a5bb63284 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -21,10 +21,11 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
 
+xbt_cfg_t simgrid_config = NULL;
+
 /* xbt_cfgelm_t: the typedef corresponding to a config variable.
 
-   Both data and DTD are mixed, but fixing it now would prevent me to ever
-   defend my thesis. */
+   Both data and DTD are mixed, but fixing it now would prevent me to ever defend my thesis. */
 
 typedef struct {
   /* Description */
@@ -42,8 +43,7 @@ typedef struct {
   xbt_dynar_t content;
 } s_xbt_cfgelm_t, *xbt_cfgelm_t;
 
-static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] =
-    { "int", "double", "string", "boolean", "any" };
+static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] = { "int", "double", "string", "boolean", "any" };
 
 const struct xbt_boolean_couple xbt_cfgelm_boolean_values[] = {
   { "yes",    "no"},
@@ -57,17 +57,13 @@ const struct xbt_boolean_couple xbt_cfgelm_boolean_values[] = {
 static void xbt_cfgelm_free(void *data);
 
 /* Retrieve the variable we'll modify */
-static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name,
-                                   e_xbt_cfgelm_type_t type);
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm_type_t type);
 
 /*----[ Memory management ]-----------------------------------------------*/
-
 /** @brief Constructor
  *
  * Initialise a config set
  */
-
-
 xbt_cfg_t xbt_cfg_new(void)
 {
   return (xbt_cfg_t) xbt_dict_new_homogeneous(&xbt_cfgelm_free);
@@ -80,7 +76,6 @@ xbt_cfg_t xbt_cfg_new(void)
  *
  * This only copy the registrations, not the actual content
  */
-
 void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto)
 {
   xbt_dict_cursor_t cursor = NULL;
@@ -92,8 +87,7 @@ void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto)
   xbt_assert(tocopy, "cannot copy NULL config");
 
   xbt_dict_foreach((xbt_dict_t) tocopy, cursor, name, variable) {
-    xbt_cfg_register(whereto, name, variable->desc, variable->type,
-                     variable->min, variable->max, variable->cb_set);
+    xbt_cfg_register(whereto, name, variable->desc, variable->type, variable->min, variable->max, variable->cb_set);
   }
 }
 
@@ -129,49 +123,41 @@ void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
     printf("%s  %s:", indent, key);
 
     size = xbt_dynar_length(variable->content);
-    printf
-        ("%d_to_%d_%s. Actual size=%d. postset=%p, List of values:\n",
-         variable->min, variable->max, xbt_cfgelm_type_name[variable->type], size, variable->cb_set);
+    printf ("%d_to_%d_%s. Actual size=%d. postset=%p, List of values:\n",
+            variable->min, variable->max, xbt_cfgelm_type_name[variable->type], size, variable->cb_set);
 
     switch (variable->type) {
-
     case xbt_cfgelm_int:
       for (i = 0; i < size; i++) {
         ival = xbt_dynar_get_as(variable->content, i, int);
         printf("%s    %d\n", indent, ival);
       }
       break;
-
     case xbt_cfgelm_double:
       for (i = 0; i < size; i++) {
         dval = xbt_dynar_get_as(variable->content, i, double);
         printf("%s    %f\n", indent, dval);
       }
       break;
-
     case xbt_cfgelm_string:
       for (i = 0; i < size; i++) {
         sval = xbt_dynar_get_as(variable->content, i, char *);
         printf("%s    %s\n", indent, sval);
       }
       break;
-
     case xbt_cfgelm_boolean:
       for (i = 0; i < size; i++) {
         ival = xbt_dynar_get_as(variable->content, i, int);
         printf("%s    %d\n", indent, ival);
       }
       break;
-
     case xbt_cfgelm_alias:
       /* no content */
       break;
-
     default:
       printf("%s    Invalid type!!\n", indent);
       break;
     }
-
   }
 
   if (name)
@@ -184,7 +170,6 @@ void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
 /*
  * free an config element
  */
-
 void xbt_cfgelm_free(void *data)
 {
   xbt_cfgelm_t c = (xbt_cfgelm_t) data;
@@ -199,7 +184,6 @@ void xbt_cfgelm_free(void *data)
 }
 
 /*----[ Registering stuff ]-----------------------------------------------*/
-
 /** @brief Register an element within a config set
  *
  *  @param cfg the config set
@@ -210,20 +194,16 @@ void xbt_cfgelm_free(void *data)
  *  @param max the maximum number of values for this config element
  *  @param cb_set callback function called when a value is set
  */
-
-void xbt_cfg_register(xbt_cfg_t * cfg,
-                 const char *name, const char *desc,
-                 e_xbt_cfgelm_type_t type, int min,
-                 int max, xbt_cfg_cb_t cb_set)
+void xbt_cfg_register(xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt_cfgelm_type_t type, int min,
+                      int max, xbt_cfg_cb_t cb_set)
 {
-  xbt_cfgelm_t res;
-
   if (*cfg == NULL)
     *cfg = xbt_cfg_new();
   xbt_assert(type >= xbt_cfgelm_int && type <= xbt_cfgelm_boolean,
               "type of %s not valid (%d should be between %d and %d)",
              name, (int)type, xbt_cfgelm_int, xbt_cfgelm_boolean);
-  res = xbt_dict_get_or_null((xbt_dict_t) * cfg, name);
+
+  xbt_cfgelm_t res = xbt_dict_get_or_null((xbt_dict_t) * cfg, name);
   xbt_assert(NULL == res, "Refusing to register the config element '%s' twice.", name);
 
   res = xbt_new(s_xbt_cfgelm_t, 1);
@@ -241,40 +221,52 @@ void xbt_cfg_register(xbt_cfg_t * cfg,
   case xbt_cfgelm_int:
     res->content = xbt_dynar_new(sizeof(int), NULL);
     break;
-
   case xbt_cfgelm_double:
     res->content = xbt_dynar_new(sizeof(double), NULL);
     break;
-
   case xbt_cfgelm_string:
     res->content = xbt_dynar_new(sizeof(char *), xbt_free_ref);
     break;
-
   case xbt_cfgelm_boolean:
     res->content = xbt_dynar_new(sizeof(int), NULL);
     break;
-
   default:
     XBT_ERROR("%d is an invalid type code", (int)type);
     break;
   }
-
   xbt_dict_set((xbt_dict_t) * cfg, name, res, NULL);
 }
 
-void xbt_cfg_register_alias(xbt_cfg_t * cfg, const char *newname, const char *oldname)
+void xbt_cfg_register_double(const char *name, const char *desc, double default_value,xbt_cfg_cb_t cb_set){
+  xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_double,1,1,cb_set);
+  xbt_cfg_setdefault_double(name, default_value);
+}
+void xbt_cfg_register_int(const char *name, const char *desc, int default_value,xbt_cfg_cb_t cb_set){
+  xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_int,1,1,cb_set);
+  xbt_cfg_setdefault_int(name, default_value);
+}
+void xbt_cfg_register_string(const char *name, const char *desc, const char *default_value, xbt_cfg_cb_t cb_set){
+  xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_string,1,1,cb_set);
+  xbt_cfg_setdefault_string(name, default_value);
+}
+void xbt_cfg_register_boolean(const char *name, const char *desc, const char*default_value,xbt_cfg_cb_t cb_set){
+  xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_boolean,1,1,cb_set);
+  xbt_cfg_setdefault_boolean(name, default_value);
+}
+
+void xbt_cfg_register_alias(const char *newname, const char *oldname)
 {
-  if (*cfg == NULL)
-    *cfg = xbt_cfg_new();
+  if (simgrid_config == NULL)
+    simgrid_config = xbt_cfg_new();
 
-  xbt_cfgelm_t res = xbt_dict_get_or_null((xbt_dict_t) * cfg, oldname);
+  xbt_cfgelm_t res = xbt_dict_get_or_null(simgrid_config, oldname);
   xbt_assert(NULL == res, "Refusing to register the option '%s' twice.", oldname);
 
-  res = xbt_dict_get_or_null((xbt_dict_t) * cfg, newname);
+  res = xbt_dict_get_or_null(simgrid_config, newname);
   xbt_assert(res, "Cannot define an alias to the non-existing option '%s'.", newname);
 
   res = xbt_new0(s_xbt_cfgelm_t, 1);
-  XBT_DEBUG("Register cfg alias %s -> %s in set %p)",oldname,newname, *cfg);
+  XBT_DEBUG("Register cfg alias %s -> %s)",oldname,newname);
 
   res->desc = bprintf("Deprecated alias for %s",newname);
   res->type = xbt_cfgelm_alias;
@@ -283,21 +275,7 @@ void xbt_cfg_register_alias(xbt_cfg_t * cfg, const char *newname, const char *ol
   res->isdefault = 1;
   res->content = (xbt_dynar_t)newname;
 
-  xbt_dict_set((xbt_dict_t) * cfg, oldname, res, NULL);
-}
-/** @brief Unregister an element from a config set.
- *
- *  @param cfg the config set
- *  @param name the name of the element to be freed
- *
- *  Note that it removes both the description and the actual content.
- *  Throws not_found when no such element exists.
- */
-
-void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
-{
-  XBT_DEBUG("Unregister elm '%s' from set %p", name, cfg);
-  xbt_dict_remove((xbt_dict_t) cfg, name);
+  xbt_dict_set(simgrid_config, oldname, res, NULL);
 }
 
 /**
@@ -312,7 +290,6 @@ void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
  *
  * Note that this does not allow to set the description, so you should prefer the other interface
  */
-
 void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
 {
   char *entrycpy = xbt_strdup(entry);
@@ -323,33 +300,25 @@ void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
   XBT_DEBUG("Register string '%s'", entry);
 
   tok = strchr(entrycpy, ':');
-  xbt_assert(tok, "Invalid config element descriptor: %s%s",
-              entry, "; Should be <name>:<min nb>_to_<max nb>_<type>");
+  xbt_assert(tok, "Invalid config element descriptor: %s%s", entry, "; Should be <name>:<min nb>_to_<max nb>_<type>");
   *(tok++) = '\0';
 
   min = strtol(tok, &tok, 10);
-  xbt_assert(tok, "Invalid minimum in config element descriptor %s",
-              entry);
+  xbt_assert(tok, "Invalid minimum in config element descriptor %s", entry);
 
-  xbt_assert(strcmp(tok, "_to_"),
-              "Invalid config element descriptor : %s%s",
+  xbt_assert(strcmp(tok, "_to_"), "Invalid config element descriptor : %s%s",
               entry, "; Should be <name>:<min nb>_to_<max nb>_<type>");
   tok += strlen("_to_");
 
   max = strtol(tok, &tok, 10);
-  xbt_assert(tok, "Invalid maximum in config element descriptor %s",
-              entry);
+  xbt_assert(tok, "Invalid maximum in config element descriptor %s", entry);
 
-  xbt_assert(*tok == '_',
-              "Invalid config element descriptor: %s%s", entry,
+  xbt_assert(*tok == '_', "Invalid config element descriptor: %s%s", entry,
               "; Should be <name>:<min nb>_to_<max nb>_<type>");
   tok++;
 
-  for (type = (e_xbt_cfgelm_type_t)0;
-       type < xbt_cfgelm_type_count
-       && strcmp(tok, xbt_cfgelm_type_name[type]); type++);
-  xbt_assert(type < xbt_cfgelm_type_count,
-              "Invalid type in config element descriptor: %s%s", entry,
+  for (type = (e_xbt_cfgelm_type_t)0; type < xbt_cfgelm_type_count && strcmp(tok, xbt_cfgelm_type_name[type]); type++);
+  xbt_assert(type < xbt_cfgelm_type_count, "Invalid type in config element descriptor: %s%s", entry,
               "; Should be one of 'string', 'int' or 'double'.");
 
   xbt_cfg_register(cfg, entrycpy, NULL, type, min, max, NULL);
@@ -377,6 +346,7 @@ void xbt_cfg_aliases(xbt_cfg_t cfg)
       printf("   %s: %s\n", name, variable->desc);
   }
 }
+
 /** @brief Displays the declared options and their description */
 void xbt_cfg_help(xbt_cfg_t cfg)
 {
@@ -418,75 +388,59 @@ void xbt_cfg_help(xbt_cfg_t cfg)
       case xbt_cfgelm_int:
         printf("%d%s", xbt_dynar_get_as(variable->content, i, int), sep);
         break;
-
       case xbt_cfgelm_double:
         printf("%f%s", xbt_dynar_get_as(variable->content, i, double), sep);
         break;
-
       case xbt_cfgelm_string:
         printf("'%s'%s", xbt_dynar_get_as(variable->content, i, char *), sep);
         break;
-
       case xbt_cfgelm_boolean: {
         int b = xbt_dynar_get_as(variable->content, i, int);
-        const char *bs = b ? xbt_cfgelm_boolean_values[0].true_val
-                           : xbt_cfgelm_boolean_values[0].false_val;
+        const char *bs = b ? xbt_cfgelm_boolean_values[0].true_val: xbt_cfgelm_boolean_values[0].false_val;
         if (b == 0 || b == 1)
           printf("'%s'%s", bs, sep);
         else
           printf("'%s/%d'%s", bs, b, sep);
         break;
       }
-
       default:
         printf("Invalid type!!%s", sep);
       }
     }
   }
-
   xbt_dynar_free(&names);
 }
 
 /** @brief Check that each variable have the right amount of values */
-void xbt_cfg_check(xbt_cfg_t cfg)
+void xbt_cfg_check(void)
 {
   xbt_dict_cursor_t cursor;
   xbt_cfgelm_t variable;
   char *name;
-  int size;
 
-  xbt_assert(cfg, "NULL config set.");
-  XBT_DEBUG("Check cfg set %p", cfg);
-
-  xbt_dict_foreach((xbt_dict_t) cfg, cursor, name, variable) {
+  xbt_dict_foreach((xbt_dict_t) simgrid_config, cursor, name, variable) {
     if (variable->type == xbt_cfgelm_alias)
       continue;
 
-    size = xbt_dynar_length(variable->content);
+    int size = xbt_dynar_length(variable->content);
     if (variable->min > size) {
       xbt_dict_cursor_free(&cursor);
-      THROWF(mismatch_error, 0,
-             "Config elem %s needs at least %d %s, but there is only %d values.",
-             name, variable->min, xbt_cfgelm_type_name[variable->type],
-             size);
+      THROWF(mismatch_error, 0, "Config elem %s needs at least %d %s, but there is only %d values.",
+             name, variable->min, xbt_cfgelm_type_name[variable->type], size);
     }
 
     if (variable->isdefault && size > variable->min) {
       xbt_dict_cursor_free(&cursor);
-      THROWF(mismatch_error, 0,
-             "Config elem %s theoretically accepts %d %s, but has a default of %d values.",
+      THROWF(mismatch_error, 0, "Config elem %s theoretically accepts %d %s, but has a default of %d values.",
              name, variable->min, xbt_cfgelm_type_name[variable->type], size);
     }
 
     if (variable->max > 0 && variable->max < size) {
       xbt_dict_cursor_free(&cursor);
-      THROWF(mismatch_error, 0,
-             "Config elem %s accepts at most %d %s, but there is %d values.",
-             name, variable->max, xbt_cfgelm_type_name[variable->type],
-             size);
+      THROWF(mismatch_error, 0, "Config elem %s accepts at most %d %s, but there is %d values.",
+             name, variable->max, xbt_cfgelm_type_name[variable->type], size);
     }
   }
-
   xbt_dict_cursor_free(&cursor);
 }
 
@@ -509,9 +463,7 @@ static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm
 
   xbt_assert(type == xbt_cfgelm_any || res->type == type,
               "You tried to access to the config element %s as an %s, but its type is %s.",
-              name,
-              xbt_cfgelm_type_name[type], xbt_cfgelm_type_name[res->type]);
-
+              name, xbt_cfgelm_type_name[type], xbt_cfgelm_type_name[res->type]);
   return res;
 }
 
@@ -522,20 +474,15 @@ static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm
  *
  * @return the type of the given element
  */
-
 e_xbt_cfgelm_type_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name)
 {
-
   xbt_cfgelm_t variable = NULL;
 
   variable = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
   if (!variable)
-    THROWF(not_found_error, 0,
-           "Can't get the type of '%s' since this variable does not exist",
-           name);
+    THROWF(not_found_error, 0, "Can't get the type of '%s' since this variable does not exist", name);
 
   XBT_DEBUG("type in variable = %d", (int)variable->type);
-
   return variable->type;
 }
 
@@ -563,9 +510,7 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
   CATCH(e) {
     if (e.category == not_found_error) {
       xbt_ex_free(e);
-      THROWF(not_found_error, 0,
-             "Can't set the property '%s' since it's not registered",
-             name);
+      THROWF(not_found_error, 0, "Can't set the property '%s' since it's not registered", name);
     }
     RETHROW;
   }
@@ -573,24 +518,20 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
   switch (type) {
   case xbt_cfgelm_string:
     str = va_arg(pa, char *);
-    xbt_cfg_set_string(cfg, name, str);
+    xbt_cfg_set_string(name, str);
     break;
-
   case xbt_cfgelm_int:
     i = va_arg(pa, int);
-    xbt_cfg_set_int(cfg, name, i);
+    xbt_cfg_set_int(name, i);
     break;
-
   case xbt_cfgelm_double:
     d = va_arg(pa, double);
-    xbt_cfg_set_double(cfg, name, d);
+    xbt_cfg_set_double(name, d);
     break;
-
   case xbt_cfgelm_boolean:
     str = va_arg(pa, char *);
-    xbt_cfg_set_boolean(cfg, name, str);
+    xbt_cfg_set_boolean(name, str);
     break;
-
   default:
     xbt_die("Config element variable %s not valid (type=%d)", name, (int)type);
   }
@@ -601,7 +542,6 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
  * @param cfg config set to fill
  * @param name variable name
  * @param ... variable value
- *
  */
 void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...)
 {
@@ -614,58 +554,41 @@ void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...)
 
 /** @brief Add values parsed from a string into a config set
  *
- * @param cfg config set to fill
- * @param options a string containing the content to add to the config set. This
- * is a '\\t',' ' or '\\n' or ',' separated list of variables. Each individual variable is
- * like "[name]:[value]" where [name] is the name of an already registred
- * variable, and [value] conforms to the data type under which this variable was
- * registred.
+ * @param options a string containing the content to add to the config set. This is a '\\t',' ' or '\\n' or ','
+ * separated list of variables. Each individual variable is like "[name]:[value]" where [name] is the name of an
+ * already registered variable, and [value] conforms to the data type under which this variable was registered.
  *
  * @todo This is a crude manual parser, it should be a proper lexer.
  */
-
-void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
-
-  char *optionlist_cpy;
-  char *option, *name, *val;
-
-  int len;
-
-  XBT_IN();
+void xbt_cfg_set_parse(const char *options)
+{
   if (!options || !strlen(options)) {   /* nothing to do */
     return;
   }
-  optionlist_cpy = xbt_strdup(options);
+  char *optionlist_cpy = xbt_strdup(options);
 
   XBT_DEBUG("List to parse and set:'%s'", options);
-  option = optionlist_cpy;
+  char *option = optionlist_cpy;
   while (1) {                   /* breaks in the code */
-
     if (!option)
       break;
-    name = option;
-    len = strlen(name);
-    XBT_DEBUG("Still to parse and set: '%s'. len=%d; option-name=%ld",
-           name, len, (long) (option - name));
+    char *name = option;
+    int len = strlen(name);
+    XBT_DEBUG("Still to parse and set: '%s'. len=%d; option-name=%ld", name, len, (long) (option - name));
 
     /* Pass the value */
-    while (option - name <= (len - 1) && *option != ' ' && *option != '\n'
-           && *option != '\t' && *option != ',') {
+    while (option - name <= (len - 1) && *option != ' ' && *option != '\n' && *option != '\t' && *option != ',') {
       XBT_DEBUG("Take %c.", *option);
       option++;
     }
     if (option - name == len) {
       XBT_DEBUG("Boundary=EOL");
       option = NULL;            /* don't do next iteration */
-
     } else {
-      XBT_DEBUG("Boundary on '%c'. len=%d;option-name=%ld",
-             *option, len, (long) (option - name));
-
+      XBT_DEBUG("Boundary on '%c'. len=%d;option-name=%ld", *option, len, (long) (option - name));
       /* Pass the following blank chars */
       *(option++) = '\0';
-      while (option - name < (len - 1) &&
-             (*option == ' ' || *option == '\n' || *option == '\t')) {
+      while (option - name < (len - 1) && (*option == ' ' || *option == '\n' || *option == '\t')) {
         /*      fprintf(stderr,"Ignore a blank char.\n"); */
         option++;
       }
@@ -679,19 +602,16 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     if (!strlen(name))
       break;
 
-    val = strchr(name, ':');
-    if (!val) {
-      /* don't free(optionlist_cpy) here, 'name' points inside it */
-      xbt_die("Option '%s' badly formatted. Should be of the form 'name:value'",
-              name);
-    }
+    char *val = strchr(name, ':');
+    xbt_assert(val, "Option '%s' badly formatted. Should be of the form 'name:value'", name);
+    /* don't free(optionlist_cpy) if the assert fails, 'name' points inside it */
     *(val++) = '\0';
 
     if (strncmp(name, "contexts/", strlen("contexts/")) && strncmp(name, "path", strlen("path")))
       XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
 
     TRY {
-      xbt_cfg_set_as_string(cfg,name,val);
+      xbt_cfg_set_as_string(name,val);
     } CATCH_ANONYMOUS {
       free(optionlist_cpy);
       RETHROW;
@@ -702,14 +622,13 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
 
 /** @brief Set the value of a variable, using the string representation of that value
  *
- * @param cfg config set to modify
  * @param key name of the variable to modify
  * @param value string representation of the value to set
  *
  * @return the first char after the parsed value in val
  */
 
-void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) {
+void *xbt_cfg_set_as_string(const char *key, const char *value) {
   xbt_ex_t e;
 
   char *ret;
@@ -719,7 +638,7 @@ void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) {
 
   TRY {
     while (variable == NULL) {
-      variable = xbt_dict_get((xbt_dict_t) cfg, key);
+      variable = xbt_dict_get((xbt_dict_t) simgrid_config, key);
       if (variable->type == xbt_cfgelm_alias) {
         const char *newname = (const char*)variable->content;
         XBT_INFO("Note: configuration '%s' is deprecated. Please use '%s' instead.", key, newname);
@@ -727,8 +646,7 @@ void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) {
         variable = NULL;
       }
     }
-  }
-  CATCH(e) {
+  } CATCH(e) {
     if (e.category == not_found_error) {
       xbt_ex_free(e);
       THROWF(not_found_error, 0, "No registered variable corresponding to '%s'.", key);
@@ -738,37 +656,30 @@ void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) {
 
   switch (variable->type) {
   case xbt_cfgelm_string:
-    xbt_cfg_set_string(cfg, key, value);     /* throws */
+    xbt_cfg_set_string(key, value);     /* throws */
     break;
-
   case xbt_cfgelm_int:
     i = strtol(value, &ret, 0);
     if (ret == value) {
       xbt_die("Value of option %s not valid. Should be an integer", key);
     }
-
-    xbt_cfg_set_int(cfg, key, i);  /* throws */
+    xbt_cfg_set_int(key, i);  /* throws */
     break;
-
   case xbt_cfgelm_double:
     d = strtod(value, &ret);
     if (ret == value) {
       xbt_die("Value of option %s not valid. Should be a double", key);
     }
-
-    xbt_cfg_set_double(cfg, key, d);       /* throws */
+    xbt_cfg_set_double(key, d);       /* throws */
     break;
-
   case xbt_cfgelm_boolean:
-    xbt_cfg_set_boolean(cfg, key, value);  /* throws */
+    xbt_cfg_set_boolean(key, value);  /* throws */
     ret = (char *)value + strlen(value);
     break;
-
   default:
     THROWF(unknown_error, 0, "Type of config element %s is not valid.", key);
     break;
   }
-
   return ret;
 }
 
@@ -777,18 +688,15 @@ void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) {
  * This is useful to change the default value of a variable while allowing
  * users to override it with command line arguments
  */
-void xbt_cfg_setdefault_int(xbt_cfg_t cfg, const char *name, int val)
+void xbt_cfg_setdefault_int(const char *name, int val)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
 
   if (variable->isdefault){
-    xbt_cfg_set_int(cfg, name, val);
+    xbt_cfg_set_int(name, val);
     variable->isdefault = 1;
-  }
-   else
-    XBT_DEBUG
-        ("Do not override configuration variable '%s' with value '%d' because it was already set.",
-         name, val);
+  } else
+    XBT_DEBUG("Do not override configuration variable '%s' with value '%d' because it was already set.", name, val);
 }
 
 /** @brief Set an integer value to \a name within \a cfg if it wasn't changed yet
@@ -796,18 +704,15 @@ void xbt_cfg_setdefault_int(xbt_cfg_t cfg, const char *name, int val)
  * This is useful to change the default value of a variable while allowing
  * users to override it with command line arguments
  */
-void xbt_cfg_setdefault_double(xbt_cfg_t cfg, const char *name, double val)
+void xbt_cfg_setdefault_double(const char *name, double val)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
 
   if (variable->isdefault) {
-    xbt_cfg_set_double(cfg, name, val);
+    xbt_cfg_set_double(name, val);
     variable->isdefault = 1;
-  }
-  else
-    XBT_DEBUG
-        ("Do not override configuration variable '%s' with value '%f' because it was already set.",
-         name, val);
+  } else
+    XBT_DEBUG("Do not override configuration variable '%s' with value '%f' because it was already set.", name, val);
 }
 
 /** @brief Set a string value to \a name within \a cfg if it wasn't changed yet
@@ -815,39 +720,32 @@ void xbt_cfg_setdefault_double(xbt_cfg_t cfg, const char *name, double val)
  * This is useful to change the default value of a variable while allowing
  * users to override it with command line arguments
  */
-void xbt_cfg_setdefault_string(xbt_cfg_t cfg, const char *name,
-                               const char *val)
+void xbt_cfg_setdefault_string(const char *name, const char *val)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
 
   if (variable->isdefault){
-    xbt_cfg_set_string(cfg, name, val);
+    xbt_cfg_set_string(name, val);
     variable->isdefault = 1;
-  }
-  else
-    XBT_DEBUG
-        ("Do not override configuration variable '%s' with value '%s' because it was already set.",
-         name, val);
+  } else
+    XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.", name, val);
 }
 
-
 /** @brief Set an boolean value to \a name within \a cfg if it wasn't changed yet
  *
  * This is useful to change the default value of a variable while allowing
  * users to override it with command line arguments
  */
-void xbt_cfg_setdefault_boolean(xbt_cfg_t cfg, const char *name, const char *val)
+void xbt_cfg_setdefault_boolean(const char *name, const char *val)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_boolean);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
 
   if (variable->isdefault){
-    xbt_cfg_set_boolean(cfg, name, val);
+    xbt_cfg_set_boolean(name, val);
     variable->isdefault = 1;
   }
    else
-    XBT_DEBUG
-        ("Do not override configuration variable '%s' with value '%s' because it was already set.",
-         name, val);
+    XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.", name, val);
 }
 
 /** @brief Set or add an integer value to \a name within \a cfg
@@ -856,20 +754,15 @@ void xbt_cfg_setdefault_boolean(xbt_cfg_t cfg, const char *name, const char *val
  * @param name the name of the variable
  * @param val the value of the variable
  */
-void xbt_cfg_set_int(xbt_cfg_t cfg, const char *name, int val)
+void xbt_cfg_set_int(const char *name, int val)
 {
-
-  XBT_VERB("Configuration setting: %s=%d", name, val);
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
 
   if (variable->max == 1) {
     xbt_dynar_set(variable->content, 0, &val);
   } else {
-    if (variable->max
-        && xbt_dynar_length(variable->content) ==
-        (unsigned long) variable->max)
-      THROWF(mismatch_error, 0,
-             "Cannot add value %d to the config element %s since it's already full (size=%d)",
+    if (variable->max && xbt_dynar_length(variable->content) == (unsigned long) variable->max)
+      THROWF(mismatch_error, 0, "Cannot add value %d to the config element %s since it's already full (size=%d)",
              val, name, variable->max);
 
     xbt_dynar_push(variable->content, &val);
@@ -886,20 +779,15 @@ void xbt_cfg_set_int(xbt_cfg_t cfg, const char *name, int val)
  * @param name the name of the variable
  * @param val the doule to set
  */
-
-void xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, double val)
+void xbt_cfg_set_double(const char *name, double val)
 {
-
-  XBT_VERB("Configuration setting: %s=%f", name, val);
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
 
   if (variable->max == 1) {
     xbt_dynar_set(variable->content, 0, &val);
   } else {
-    if (variable->max
-        && xbt_dynar_length(variable->content) == variable->max)
-      THROWF(mismatch_error, 0,
-             "Cannot add value %f to the config element %s since it's already full (size=%d)",
+    if (variable->max && xbt_dynar_length(variable->content) == variable->max)
+      THROWF(mismatch_error, 0, "Cannot add value %f to the config element %s since it's already full (size=%d)",
              val, name, variable->max);
 
     xbt_dynar_push(variable->content, &val);
@@ -917,16 +805,10 @@ void xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, double val)
  * @param val the value to be added
  *
  */
-
-void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val)
+void xbt_cfg_set_string(const char *name, const char *val)
 {
   char *newval = xbt_strdup(val);
-
-  XBT_VERB("Configuration setting: %s=%s", name, val);
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
-
-  XBT_DEBUG("Variable: %d to %d %s (=%d) @%p",
-         variable->min, variable->max, xbt_cfgelm_type_name[variable->type], (int)variable->type, variable);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
 
   if (variable->max == 1) {
     if (!xbt_dynar_is_empty(variable->content)) {
@@ -938,8 +820,7 @@ void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val)
   } else {
     if (variable->max
         && xbt_dynar_length(variable->content) == variable->max)
-      THROWF(mismatch_error, 0,
-             "Cannot add value %s to the config element %s since it's already full (size=%d)",
+      THROWF(mismatch_error, 0, "Cannot add value %s to the config element %s since it's already full (size=%d)",
              name, val, variable->max);
 
     xbt_dynar_push(variable->content, &newval);
@@ -952,26 +833,23 @@ void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val)
 
 /** @brief Set or add a boolean value to \a name within \a cfg
  *
- * @param cfg the config set
  * @param name the name of the variable
  * @param val the value of the variable
  */
-void xbt_cfg_set_boolean(xbt_cfg_t cfg, const char *name, const char *val)
+void xbt_cfg_set_boolean(const char *name, const char *val)
 {
   int i, bval;
-
-  XBT_VERB("Configuration setting: %s=%s", name, val);
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_boolean);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
 
   for (i = 0; xbt_cfgelm_boolean_values[i].true_val != NULL; i++) {
-  if (strcmp(val, xbt_cfgelm_boolean_values[i].true_val) == 0){
-    bval = 1;
-    break;
-  }
-  if (strcmp(val, xbt_cfgelm_boolean_values[i].false_val) == 0){
-    bval = 0;
-    break;
-  }
+    if (strcmp(val, xbt_cfgelm_boolean_values[i].true_val) == 0){
+      bval = 1;
+      break;
+    }
+    if (strcmp(val, xbt_cfgelm_boolean_values[i].false_val) == 0){
+      bval = 0;
+      break;
+    }
   }
   if (xbt_cfgelm_boolean_values[i].true_val == NULL) {
     xbt_die("Value of option '%s' not valid. Should be a boolean (yes,no,on,off,true,false,0,1)", val);
@@ -980,11 +858,8 @@ void xbt_cfg_set_boolean(xbt_cfg_t cfg, const char *name, const char *val)
   if (variable->max == 1) {
     xbt_dynar_set(variable->content, 0, &bval);
   } else {
-    if (variable->max
-        && xbt_dynar_length(variable->content) ==
-        (unsigned long) variable->max)
-      THROWF(mismatch_error, 0,
-             "Cannot add value %s to the config element %s since it's already full (size=%d)",
+    if (variable->max && xbt_dynar_length(variable->content) == (unsigned long) variable->max)
+      THROWF(mismatch_error, 0, "Cannot add value %s to the config element %s since it's already full (size=%d)",
              val, name, variable->max);
 
     xbt_dynar_push(variable->content, &bval);
@@ -995,196 +870,28 @@ void xbt_cfg_set_boolean(xbt_cfg_t cfg, const char *name, const char *val)
   variable->isdefault = 0;
 }
 
-/* ---- [ Removing ] ---- */
 
-/** @brief Remove the provided \e val integer value from a variable
- *
- * @param cfg the config set
- * @param name the name of the variable
- * @param val the value to be removed
- */
-void xbt_cfg_rm_int(xbt_cfg_t cfg, const char *name, int val)
-{
-
-  unsigned int cpt;
-  int seen;
-
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
-
-  if (xbt_dynar_length(variable->content) == variable->min)
-    THROWF(mismatch_error, 0,
-           "Cannot remove value %d from the config element %s since it's already at its minimal size (=%d)",
-           val, name, variable->min);
-
-  xbt_dynar_foreach(variable->content, cpt, seen) {
-    if (seen == val) {
-      xbt_dynar_cursor_rm(variable->content, &cpt);
-      return;
-    }
-  }
-
-  THROWF(not_found_error, 0,
-         "Can't remove the value %d of config element %s: value not found.",
-         val, name);
-}
-
-/** @brief Remove the provided \e val double value from a variable
- *
- * @param cfg the config set
- * @param name the name of the variable
- * @param val the value to be removed
- */
-
-void xbt_cfg_rm_double(xbt_cfg_t cfg, const char *name, double val)
-{
-  unsigned int cpt;
-  double seen;
-
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
-
-  if (xbt_dynar_length(variable->content) == variable->min)
-    THROWF(mismatch_error, 0,
-           "Cannot remove value %f from the config element %s since it's already at its minimal size (=%d)",
-           val, name, variable->min);
-
-  xbt_dynar_foreach(variable->content, cpt, seen) {
-    if (seen == val) {
-      xbt_dynar_cursor_rm(variable->content, &cpt);
-      return;
-    }
-  }
-
-  THROWF(not_found_error, 0,
-         "Can't remove the value %f of config element %s: value not found.",
-         val, name);
-}
-
-/** @brief Remove the provided \e val string value from a variable
- *
- * @param cfg the config set
- * @param name the name of the variable
- * @param val the value of the string which will be removed
- */
-void xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name, const char *val)
-{
-  unsigned int cpt;
-  char *seen;
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
-
-  if (xbt_dynar_length(variable->content) == variable->min)
-    THROWF(mismatch_error, 0,
-           "Cannot remove value %s from the config element %s since it's already at its minimal size (=%d)",
-           name, val, variable->min);
-
-  xbt_dynar_foreach(variable->content, cpt, seen) {
-    if (!strcpy(seen, val)) {
-      xbt_dynar_cursor_rm(variable->content, &cpt);
-      return;
-    }
-  }
-
-  THROWF(not_found_error, 0,
-         "Can't remove the value %s of config element %s: value not found.",
-         val, name);
-}
-
-/** @brief Remove the provided \e val boolean value from a variable
- *
- * @param cfg the config set
- * @param name the name of the variable
- * @param val the value to be removed
- */
-void xbt_cfg_rm_boolean(xbt_cfg_t cfg, const char *name, int val)
-{
-
-  unsigned int cpt;
-  int seen;
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_boolean);
-
-  if (xbt_dynar_length(variable->content) == variable->min)
-    THROWF(mismatch_error, 0,
-           "Cannot remove value %d from the config element %s since it's already at its minimal size (=%d)",
-           val, name, variable->min);
-
-  xbt_dynar_foreach(variable->content, cpt, seen) {
-    if (seen == val) {
-      xbt_dynar_cursor_rm(variable->content, &cpt);
-      return;
-    }
-  }
-
-  THROWF(not_found_error, 0,
-         "Can't remove the value %d of config element %s: value not found.",
-         val, name);
-}
-
-/** @brief Remove the \e pos th value from the provided variable */
-
-void xbt_cfg_rm_at(xbt_cfg_t cfg, const char *name, int pos)
-{
-
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_any);
-
-  if (xbt_dynar_length(variable->content) == variable->min)
-    THROWF(mismatch_error, 0,
-           "Cannot remove %dth value from the config element %s since it's already at its minimal size (=%d)",
-           pos, name, variable->min);
-
-  xbt_dynar_remove_at(variable->content, pos, NULL);
-}
-
-/** @brief Remove all the values from a variable
- *
- * @param cfg the config set
- * @param name the name of the variable
- */
-
-void xbt_cfg_empty(xbt_cfg_t cfg, const char *name)
-{
-  xbt_cfgelm_t variable = NULL;
-  xbt_ex_t e;
-
-  TRY {
-    variable = xbt_dict_get((xbt_dict_t) cfg, name);
-  }
-  CATCH(e) {
-    if (e.category != not_found_error)
-      RETHROW;
-
-    xbt_ex_free(e);
-    THROWF(not_found_error, 0, "Can't empty  '%s' since this option does not exist", name);
-  }
-
-  if (variable)
-    xbt_dynar_reset(variable->content);
-}
-/*
- * Say if the value is the default value
- */
-int xbt_cfg_is_default_value(xbt_cfg_t cfg, const char *name)
+/* Say if the value is the default value */
+int xbt_cfg_is_default_value(const char *name)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_any);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_any);
   return variable->isdefault;
 }
 
 /*----[ Getting ]---------------------------------------------------------*/
-
 /** @brief Retrieve an integer value of a variable (get a warning if not uniq)
  *
- * @param cfg the config set
  * @param name the name of the variable
  *
  * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using
- * xbt_cfg_get_dynar() instead.
+ * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
  */
-int xbt_cfg_get_int(xbt_cfg_t cfg, const char *name)
+int xbt_cfg_get_int(const char *name)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
 
   if (xbt_dynar_length(variable->content) > 1) {
-    XBT_WARN
-        ("You asked for the first value of the config element '%s', but there is %lu values",
+    XBT_WARN("You asked for the first value of the config element '%s', but there is %lu values",
          name, xbt_dynar_length(variable->content));
   }
 
@@ -1197,17 +904,14 @@ int xbt_cfg_get_int(xbt_cfg_t cfg, const char *name)
  * @param name the name of the variable
  *
  * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using
- * xbt_cfg_get_dynar() instead.
+ * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
  */
-
-double xbt_cfg_get_double(xbt_cfg_t cfg, const char *name)
+double xbt_cfg_get_double(const char *name)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
 
   if (xbt_dynar_length(variable->content) > 1) {
-    XBT_WARN
-        ("You asked for the first value of the config element '%s', but there is %lu values\n",
+    XBT_WARN ("You asked for the first value of the config element '%s', but there is %lu values\n",
          name, xbt_dynar_length(variable->content));
   }
 
@@ -1225,14 +929,12 @@ double xbt_cfg_get_double(xbt_cfg_t cfg, const char *name)
  *
  * \warning the returned value is the actual content of the config set
  */
-
-char *xbt_cfg_get_string(xbt_cfg_t cfg, const char *name)
+char *xbt_cfg_get_string(const char *name)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
 
   if (xbt_dynar_length(variable->content) > 1) {
-    XBT_WARN
-        ("You asked for the first value of the config element '%s', but there is %lu values\n",
+    XBT_WARN("You asked for the first value of the config element '%s', but there is %lu values\n",
          name, xbt_dynar_length(variable->content));
   } else if (xbt_dynar_is_empty(variable->content)) {
     return NULL;
@@ -1247,16 +949,14 @@ char *xbt_cfg_get_string(xbt_cfg_t cfg, const char *name)
  * @param name the name of the variable
  *
  * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using
- * xbt_cfg_get_dynar() instead.
+ * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
  */
-int xbt_cfg_get_boolean(xbt_cfg_t cfg, const char *name)
+int xbt_cfg_get_boolean(const char *name)
 {
-  xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_boolean);
+  xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
 
   if (xbt_dynar_length(variable->content) > 1) {
-    XBT_WARN
-        ("You asked for the first value of the config element '%s', but there is %lu values",
+    XBT_WARN("You asked for the first value of the config element '%s', but there is %lu values",
          name, xbt_dynar_length(variable->content));
   }
 
@@ -1272,19 +972,17 @@ int xbt_cfg_get_boolean(xbt_cfg_t cfg, const char *name)
  *
  * \warning the returned value is the actual content of the config set
  */
-xbt_dynar_t xbt_cfg_get_dynar(xbt_cfg_t cfg, const char *name)
+xbt_dynar_t xbt_cfg_get_dynar(const char *name)
 {
   xbt_cfgelm_t variable = NULL;
   xbt_ex_t e;
 
   TRY {
-    variable = xbt_dict_get((xbt_dict_t) cfg, name);
-  }
-  CATCH(e) {
+    variable = xbt_dict_get((xbt_dict_t) simgrid_config, name);
+  } CATCH(e) {
     if (e.category == not_found_error) {
       xbt_ex_free(e);
-      THROWF(not_found_error, 0,
-             "No registered variable %s in this config set", name);
+      THROWF(not_found_error, 0, "No registered variable %s in this config set", name);
     }
     RETHROW;
   }
@@ -1292,11 +990,9 @@ xbt_dynar_t xbt_cfg_get_dynar(xbt_cfg_t cfg, const char *name)
   return variable->content;
 }
 
-
 /** @brief Retrieve one of the integer value of a variable */
 int xbt_cfg_get_int_at(xbt_cfg_t cfg, const char *name, int pos)
 {
-
   xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
   return xbt_dynar_get_as(variable->content, pos, int);
 }
@@ -1304,16 +1000,13 @@ int xbt_cfg_get_int_at(xbt_cfg_t cfg, const char *name, int pos)
 /** @brief Retrieve one of the double value of a variable */
 double xbt_cfg_get_double_at(xbt_cfg_t cfg, const char *name, int pos)
 {
-
   xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
   return xbt_dynar_get_as(variable->content, pos, double);
 }
 
-
 /** @brief Retrieve one of the string value of a variable */
 char *xbt_cfg_get_string_at(xbt_cfg_t cfg, const char *name, int pos)
 {
-
   xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
   return xbt_dynar_get_as(variable->content, pos, char *);
 }
@@ -1321,12 +1014,10 @@ char *xbt_cfg_get_string_at(xbt_cfg_t cfg, const char *name, int pos)
 /** @brief Retrieve one of the boolean value of a variable */
 int xbt_cfg_get_boolean_at(xbt_cfg_t cfg, const char *name, int pos)
 {
-
   xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_boolean);
   return xbt_dynar_get_as(variable->content, pos, int);
 }
 
-
 #ifdef SIMGRID_TEST
 #include "xbt.h"
 #include "xbt/ex.h"
@@ -1347,119 +1038,94 @@ static xbt_cfg_t make_set()
   return set;
 }                               /* end_of_make_set */
 
+extern xbt_cfg_t simgrid_config;
+
 XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
 {
-  xbt_cfg_t set = make_set();
+  simgrid_config = make_set();
   xbt_test_add("Alloc and free a config set");
-  xbt_cfg_set_parse(set,
-                    "peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
-  xbt_cfg_free(&set);
-  xbt_cfg_free(&set);
+  xbt_cfg_set_parse("peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
+  xbt_cfg_free(&simgrid_config);
 }
 
 XBT_TEST_UNIT("validation", test_config_validation, "Validation tests")
 {
-  xbt_cfg_t set = set = make_set();
   xbt_ex_t e;
 
+  simgrid_config = make_set();
   xbt_test_add("Having too few elements for speed");
-  xbt_cfg_set_parse(set,
-                    "peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
+  xbt_cfg_set_parse("peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
   TRY {
-    xbt_cfg_check(set);
-  }
-  CATCH(e) {
-    if (e.category != mismatch_error ||
-        strncmp(e.msg, "Config elem speed needs",
-                strlen("Config elem speed needs")))
+    xbt_cfg_check();
+  } CATCH(e) {
+    if (e.category != mismatch_error || strncmp(e.msg, "Config elem speed needs", strlen("Config elem speed needs")))
       xbt_test_fail("Got an exception. msg=%s", e.msg);
     xbt_ex_free(e);
   }
-  xbt_cfg_free(&set);
-  xbt_cfg_free(&set);
-
-
 
   xbt_test_add("Having too much values of 'speed'");
-  set = make_set();
-  xbt_cfg_set_parse(set, "peername:toto:42 user:alegrand");
+  xbt_cfg_set_parse("peername:toto:42 user:alegrand");
   TRY {
-    xbt_cfg_set_parse(set, "speed:42 speed:24 speed:34");
-  }
-  CATCH(e) {
+    xbt_cfg_set_parse("speed:42 speed:24 speed:34");
+  } CATCH(e) {
     if (e.category != mismatch_error ||
-        strncmp(e.msg, "Cannot add value 34 to the config elem speed",
-                strlen("Config elem speed needs")))
+        strncmp(e.msg, "Cannot add value 34 to the config elem speed", strlen("Config elem speed needs")))
       xbt_test_fail("Got an exception. msg=%s", e.msg);
     xbt_ex_free(e);
   }
-  xbt_cfg_check(set);
-  xbt_cfg_free(&set);
-  xbt_cfg_free(&set);
-
+  xbt_cfg_check();
+  xbt_cfg_free(&simgrid_config);
 }
 
 XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
 {
-
+  simgrid_config = make_set();
   xbt_test_add("Get a single value");
   {
     /* get_single_value */
     int ival;
-    xbt_cfg_t myset = make_set();
 
-    xbt_cfg_set_parse(myset, "peername:toto:42 speed:42");
-    ival = xbt_cfg_get_int(myset, "speed");
+    xbt_cfg_set_parse("peername:toto:42 speed:42");
+    ival = xbt_cfg_get_int("speed");
     if (ival != 42)
       xbt_test_fail("Speed value = %d, I expected 42", ival);
-    xbt_cfg_free(&myset);
   }
 
   xbt_test_add("Get multiple values");
   {
     /* get_multiple_value */
     xbt_dynar_t dyn;
-    xbt_cfg_t myset = make_set();
 
-    xbt_cfg_set_parse(myset,
-                      "peername:veloce user:foo\nuser:bar\tuser:toto");
-    xbt_cfg_set_parse(myset, "speed:42");
-    xbt_cfg_check(myset);
-    dyn = xbt_cfg_get_dynar(myset, "user");
+    xbt_cfg_set_parse("peername:veloce user:foo\nuser:bar\tuser:toto");
+    xbt_cfg_set_parse("speed:42");
+    xbt_cfg_check();
+    dyn = xbt_cfg_get_dynar("user");
 
     if (xbt_dynar_length(dyn) != 3)
-      xbt_test_fail("Dynar length = %lu, I expected 3",
-                     xbt_dynar_length(dyn));
+      xbt_test_fail("Dynar length = %lu, I expected 3", xbt_dynar_length(dyn));
 
     if (strcmp(xbt_dynar_get_as(dyn, 0, char *), "foo"))
-       xbt_test_fail("Dynar[0] = %s, I expected foo",
-                      xbt_dynar_get_as(dyn, 0, char *));
+       xbt_test_fail("Dynar[0] = %s, I expected foo", xbt_dynar_get_as(dyn, 0, char *));
 
     if (strcmp(xbt_dynar_get_as(dyn, 1, char *), "bar"))
-       xbt_test_fail("Dynar[1] = %s, I expected bar",
-                      xbt_dynar_get_as(dyn, 1, char *));
+       xbt_test_fail("Dynar[1] = %s, I expected bar", xbt_dynar_get_as(dyn, 1, char *));
 
     if (strcmp(xbt_dynar_get_as(dyn, 2, char *), "toto"))
-       xbt_test_fail("Dynar[2] = %s, I expected toto",
-                      xbt_dynar_get_as(dyn, 2, char *));
-    xbt_cfg_free(&myset);
+       xbt_test_fail("Dynar[2] = %s, I expected toto", xbt_dynar_get_as(dyn, 2, char *));
   }
 
   xbt_test_add("Access to a non-existant entry");
   {
-    /* non-existant_entry */
-    xbt_cfg_t myset = make_set();
     xbt_ex_t e;
 
     TRY {
-      xbt_cfg_set_parse(myset, "color:blue");
-    }
-    CATCH(e) {
+      xbt_cfg_set_parse("color:blue");
+    } CATCH(e) {
       if (e.category != not_found_error)
         xbt_test_exception(e);
       xbt_ex_free(e);
     }
-    xbt_cfg_free(&myset);
   }
+  xbt_cfg_free(&simgrid_config);
 }
 #endif                          /* SIMGRID_TEST */