X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/440a829aa9339d2954e408218d33a04298fcf113..7f71c595be569acd81e8c7b97924bd2d0efc3f6c:/src/xbt/config.c

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 32c07f6713..1890645955 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -21,9 +21,10 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
 
-/* xbt_cfgelm_t: the typedef corresponding to a config variable.
+xbt_cfg_t simgrid_config = NULL;
+static void xbt_cfg_register(xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt_cfgelm_type_t type, xbt_cfg_cb_t cb_set);
 
-   Both data and DTD are mixed, but fixing it now would prevent me to ever defend my thesis. */
+/* xbt_cfgelm_t: the typedef corresponding to a config variable. */
 
 typedef struct {
   /* Description */
@@ -31,7 +32,6 @@ typedef struct {
 
   /* Allowed type of the variable */
   e_xbt_cfgelm_type_t type;
-  int min, max;
   unsigned isdefault:1;
 
   /* Callbacks */
@@ -41,7 +41,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", "outofbound" };
 
 const struct xbt_boolean_couple xbt_cfgelm_boolean_values[] = {
   { "yes",    "no"},
@@ -84,9 +84,8 @@ void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto)
   *whereto = NULL;
   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_dict_foreach((xbt_dict_t) tocopy, cursor, name, variable)
+    xbt_cfg_register(whereto, name, variable->desc, variable->type, variable->cb_set);
 }
 
 /** @brief Destructor */
@@ -121,8 +120,8 @@ 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 ("%s. Actual size=%d. postset=%p, List of values:\n",
+            xbt_cfgelm_type_name[variable->type], size, variable->cb_set);
 
     switch (variable->type) {
     case xbt_cfgelm_int:
@@ -188,31 +187,25 @@ void xbt_cfgelm_free(void *data)
  *  @param name the name of the config element
  *  @param desc a description for this item (used by xbt_cfg_help())
  *  @param type the type of the config element
- *  @param min the minimum number of values for this config element
- *  @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)
+static void xbt_cfg_register(xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt_cfgelm_type_t type, 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);
-  XBT_DEBUG("Register cfg elm %s (%s) (%d to %d %s (=%d) @%p in set %p)",
-            name, desc, min, max, xbt_cfgelm_type_name[type], (int)type, res, *cfg);
+  XBT_DEBUG("Register cfg elm %s (%s) (%s (=%d) @%p in set %p)",
+            name, desc, xbt_cfgelm_type_name[type], (int)type, res, *cfg);
 
   res->desc = xbt_strdup(desc);
   res->type = type;
-  res->min = min;
-  res->max = max;
   res->cb_set = cb_set;
   res->isdefault = 1;
 
@@ -236,59 +229,43 @@ void xbt_cfg_register(xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt
   xbt_dict_set((xbt_dict_t) * cfg, name, res, NULL);
 }
 
-void xbt_cfg_register_double(xbt_cfg_t * cfg, const char *name, const char *desc, double default_value,xbt_cfg_cb_t cb_set){
-  xbt_cfg_register(cfg,name,desc,xbt_cfgelm_double,1,1,cb_set);
-  xbt_cfg_setdefault_double(*cfg, name, default_value);
+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,cb_set);
+  xbt_cfg_setdefault_double(name, default_value);
 }
-void xbt_cfg_register_int(xbt_cfg_t * cfg, const char *name, const char *desc, int default_value,xbt_cfg_cb_t cb_set){
-  xbt_cfg_register(cfg,name,desc,xbt_cfgelm_int,1,1,cb_set);
-  xbt_cfg_setdefault_int(*cfg, 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,cb_set);
+  xbt_cfg_setdefault_int(name, default_value);
 }
-void xbt_cfg_register_string(xbt_cfg_t * cfg, const char *name, const char *desc, const char *default_value, xbt_cfg_cb_t cb_set){
-  xbt_cfg_register(cfg,name,desc,xbt_cfgelm_string,1,1,cb_set);
-  xbt_cfg_setdefault_string(*cfg, 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,cb_set);
+  xbt_cfg_setdefault_string(name, default_value);
 }
-void xbt_cfg_register_boolean(xbt_cfg_t * cfg, const char *name, const char *desc, const char*default_value,xbt_cfg_cb_t cb_set){
-  xbt_cfg_register(cfg,name,desc,xbt_cfgelm_boolean,1,1,cb_set);
-  xbt_cfg_setdefault_boolean(*cfg, 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,cb_set);
+  xbt_cfg_setdefault_boolean(name, default_value);
 }
 
-void xbt_cfg_register_alias(xbt_cfg_t * cfg, const char *newname, const char *oldname)
+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;
-  res->min = 1;
-  res->max = 1;
   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);
 }
 
 /**
@@ -298,8 +275,8 @@ void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
  * @param entry a string describing the element to register
  *
  * The string may consist in several variable descriptions separated by a space.
- * Each of them must use the following syntax: \<name\>:\<min nb\>_to_\<max nb\>_\<type\>
- * with type being one of  'string','int' or 'double'.
+ * Each of them must use the following syntax: \<name\>:\<type\>
+ * with type being one of  'string','int','bool' or 'double'.
  *
  * Note that this does not allow to set the description, so you should prefer the other interface
  */
@@ -308,39 +285,24 @@ void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
   char *entrycpy = xbt_strdup(entry);
   char *tok;
 
-  int min, max;
   e_xbt_cfgelm_type_t type;
   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; Should be <name>:<type>", entry);
   *(tok++) = '\0';
 
-  min = strtol(tok, &tok, 10);
-  xbt_assert(tok, "Invalid minimum in config element descriptor %s", entry);
-
-  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 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,
-              "; Should be one of 'string', 'int' or 'double'.");
+  xbt_assert(type < xbt_cfgelm_type_count,
+      "Invalid type in config element descriptor: %s; Should be one of 'string', 'int' or 'double'.", entry);
 
-  xbt_cfg_register(cfg, entrycpy, NULL, type, min, max, NULL);
+  xbt_cfg_register(cfg, entrycpy, NULL, type, NULL);
 
   free(entrycpy);               /* strdup'ed by dict mechanism, but cannot be const */
 }
 
 /** @brief Displays the declared aliases and their description */
-void xbt_cfg_aliases(xbt_cfg_t cfg)
+void xbt_cfg_aliases(void)
 {
   xbt_dict_cursor_t dict_cursor;
   unsigned int dynar_cursor;
@@ -348,12 +310,12 @@ void xbt_cfg_aliases(xbt_cfg_t cfg)
   char *name;
   xbt_dynar_t names = xbt_dynar_new(sizeof(char *), NULL);
 
-  xbt_dict_foreach((xbt_dict_t )cfg, dict_cursor, name, variable)
+  xbt_dict_foreach((xbt_dict_t )simgrid_config, dict_cursor, name, variable)
     xbt_dynar_push(names, &name);
   xbt_dynar_sort_strings(names);
 
   xbt_dynar_foreach(names, dynar_cursor, name) {
-    variable = xbt_dict_get((xbt_dict_t )cfg, name);
+    variable = xbt_dict_get((xbt_dict_t )simgrid_config, name);
 
     if (variable->type == xbt_cfgelm_alias)
       printf("   %s: %s\n", name, variable->desc);
@@ -361,7 +323,7 @@ void xbt_cfg_aliases(xbt_cfg_t cfg)
 }
 
 /** @brief Displays the declared options and their description */
-void xbt_cfg_help(xbt_cfg_t cfg)
+void xbt_cfg_help(void)
 {
   xbt_dict_cursor_t dict_cursor;
   unsigned int dynar_cursor;
@@ -369,32 +331,24 @@ void xbt_cfg_help(xbt_cfg_t cfg)
   char *name;
   xbt_dynar_t names = xbt_dynar_new(sizeof(char *), NULL);
 
-  xbt_dict_foreach((xbt_dict_t )cfg, dict_cursor, name, variable)
+  xbt_dict_foreach((xbt_dict_t )simgrid_config, dict_cursor, name, variable)
     xbt_dynar_push(names, &name);
   xbt_dynar_sort_strings(names);
 
   xbt_dynar_foreach(names, dynar_cursor, name) {
-    int i;
     int size;
-    variable = xbt_dict_get((xbt_dict_t )cfg, name);
+    variable = xbt_dict_get((xbt_dict_t )simgrid_config, name);
     if (variable->type == xbt_cfgelm_alias)
       continue;
 
     printf("   %s: %s\n", name, variable->desc);
     printf("       Type: %s; ", xbt_cfgelm_type_name[variable->type]);
-    if (variable->min != 1 || variable->max != 1) {
-      printf("Arity: min:%d to max:", variable->min);
-      if (variable->max == 0)
-        printf("(no bound); ");
-      else
-        printf("%d; ", variable->max);
-    }
     size = xbt_dynar_length(variable->content);
-    printf("Current value%s: ", (size <= 1 ? "" : "s"));
+    printf("Current value: ");
 
     if (size != 1)
       printf(size == 0 ? "n/a\n" : "{ ");
-    for (i = 0; i < size; i++) {
+    for (int i = 0; i < size; i++) {
       const char *sep = (size == 1 ? "\n" : (i < size - 1 ? ", " : " }\n"));
 
       switch (variable->type) {
@@ -418,49 +372,13 @@ void xbt_cfg_help(xbt_cfg_t cfg)
       }
       default:
         printf("Invalid type!!%s", sep);
+        break;
       }
     }
   }
   xbt_dynar_free(&names);
 }
 
-/** @brief Check that each variable have the right amount of values */
-void xbt_cfg_check(xbt_cfg_t cfg)
-{
-  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) {
-    if (variable->type == xbt_cfgelm_alias)
-      continue;
-
-    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);
-    }
-
-    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.",
-             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);
-    }
-  }
-  xbt_dict_cursor_free(&cursor);
-}
-
 static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm_type_t type)
 {
   xbt_cfgelm_t res = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
@@ -473,7 +391,7 @@ static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm
   }
 
   if (!res) {
-    xbt_cfg_help(cfg);
+    xbt_cfg_help();
     fflush(stdout);
     THROWF(not_found_error, 0, "No registered variable '%s' in this config set.", name);
   }
@@ -517,7 +435,7 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
   char *str;
   int i;
   double d;
-  e_xbt_cfgelm_type_t type = xbt_cfgelm_any; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
+  e_xbt_cfgelm_type_t type = xbt_cfgelm_type_count; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
 
   xbt_ex_t e;
 
@@ -535,19 +453,19 @@ 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);
@@ -571,31 +489,26 @@ 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 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);
+    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 */
@@ -624,18 +537,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;
@@ -646,14 +557,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;
@@ -663,7 +573,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);
@@ -681,24 +591,24 @@ 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:
@@ -713,12 +623,12 @@ 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);
@@ -729,12 +639,12 @@ 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);
@@ -745,12 +655,12 @@ 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);
@@ -761,12 +671,12 @@ void xbt_cfg_setdefault_string(xbt_cfg_t cfg, const char *name, const char *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_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
@@ -779,20 +689,11 @@ 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)",
-             val, name, variable->max);
-
-    xbt_dynar_push(variable->content, &val);
-  }
+  xbt_dynar_set(variable->content, 0, &val);
 
   if (variable->cb_set)
     variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
@@ -805,20 +706,11 @@ 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)",
-             val, name, variable->max);
-
-    xbt_dynar_push(variable->content, &val);
-  }
+  xbt_dynar_set(variable->content, 0, &val);
 
   if (variable->cb_set)
     variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
@@ -832,32 +724,18 @@ 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_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
 
-  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);
-
-  if (variable->max == 1) {
-    if (!xbt_dynar_is_empty(variable->content)) {
-      char *sval = xbt_dynar_get_as(variable->content, 0, char *);
-      free(sval);
-    }
-
-    xbt_dynar_set(variable->content, 0, &newval);
-  } 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)",
-             name, val, variable->max);
-
-    xbt_dynar_push(variable->content, &newval);
+  if (!xbt_dynar_is_empty(variable->content)) {
+    char *sval = xbt_dynar_get_as(variable->content, 0, char *);
+    free(sval);
   }
 
+  xbt_dynar_set(variable->content, 0, &newval);
+
   if (variable->cb_set)
     variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
   variable->isdefault = 0;
@@ -865,16 +743,13 @@ 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){
@@ -890,187 +765,32 @@ void xbt_cfg_set_boolean(xbt_cfg_t cfg, const char *name, const char *val)
     xbt_die("Value of option '%s' not valid. Should be a boolean (yes,no,on,off,true,false,0,1)", 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)",
-             val, name, variable->max);
-
-    xbt_dynar_push(variable->content, &bval);
-  }
+  xbt_dynar_set(variable->content, 0, &bval);
 
   if (variable->cb_set)
     variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
   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)
+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.
  */
-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",
@@ -1088,9 +808,9 @@ int xbt_cfg_get_int(xbt_cfg_t cfg, const char *name)
  * 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.
  */
-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",
@@ -1111,9 +831,9 @@ 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",
@@ -1133,9 +853,9 @@ char *xbt_cfg_get_string(xbt_cfg_t cfg, const char *name)
  * 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.
  */
-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",
@@ -1154,13 +874,13 @@ 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);
+    variable = xbt_dict_get((xbt_dict_t) simgrid_config, name);
   } CATCH(e) {
     if (e.category == not_found_error) {
       xbt_ex_free(e);
@@ -1213,109 +933,49 @@ static xbt_cfg_t make_set()
   xbt_cfg_t set = NULL;
 
   xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
-  xbt_cfg_register_str(&set, "speed:1_to_2_int");
-  xbt_cfg_register_str(&set, "peername:1_to_1_string");
-  xbt_cfg_register_str(&set, "user:1_to_10_string");
+  xbt_cfg_register_str(&set, "speed:int");
+  xbt_cfg_register_str(&set, "peername:string");
+  xbt_cfg_register_str(&set, "user:string");
 
   return set;
 }                               /* end_of_make_set */
 
+XBT_PUBLIC_DATA(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_TEST_UNIT("validation", test_config_validation, "Validation tests")
-{
-  xbt_cfg_t set = set = make_set();
-  xbt_ex_t e;
-
-  xbt_test_add("Having too few elements for speed");
-  xbt_cfg_set_parse(set, "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_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");
-  TRY {
-    xbt_cfg_set_parse(set, "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")))
-      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_set_parse("peername:veloce user:bidule");
+  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");
-
-    if (xbt_dynar_length(dyn) != 3)
-      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 *));
-
-    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 *));
-
-    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_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");
+      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 */