X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86a08ab9c895a99c7efb4ee38db24c3541deb6bd..b034dec40bc1f38856fe1d599d0ab5a3174780f7:/src/xbt/config.c

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 72ad05ece4..f5541c08f0 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -29,7 +29,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
 
 typedef struct {
   /* Description */
-  const char *desc;
+  char *desc;
 
   /* Allowed type of the variable */
   e_xbt_cfgelm_type_t type;
@@ -86,8 +86,9 @@ void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto)
   xbt_assert0(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, variable->cb_rm);
+    xbt_cfg_register(whereto, name, variable->desc, variable->type, NULL,
+                     variable->min, variable->max, variable->cb_set,
+                     variable->cb_rm);
   }
 }
 
@@ -184,6 +185,7 @@ void xbt_cfgelm_free(void *data)
   DEBUG1("Frees cfgelm %p", c);
   if (!c)
     return;
+  xbt_free(c->desc);
   xbt_dynar_free(&(c->content));
   free(c);
 }
@@ -199,17 +201,19 @@ void xbt_cfgelm_free(void *data)
  */
 
 void
-xbt_cfg_register(xbt_cfg_t cfg,
+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_cfg_cb_t cb_rm)
+                 void *default_value, int min, int max, xbt_cfg_cb_t cb_set,
+                 xbt_cfg_cb_t cb_rm)
 {
   xbt_cfgelm_t res;
 
-  xbt_assert(cfg);
+  if (*cfg == NULL)
+    *cfg = xbt_cfg_new();
   xbt_assert4(type >= xbt_cfgelm_int && type <= xbt_cfgelm_peer,
               "type of %s not valid (%d should be between %d and %d)",
               name, type, xbt_cfgelm_int, xbt_cfgelm_peer);
-  res = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
+  res = xbt_dict_get_or_null((xbt_dict_t) * cfg, name);
 
   if (res) {
     WARN1("Config elem %s registered twice.", name);
@@ -218,9 +222,9 @@ xbt_cfg_register(xbt_cfg_t cfg,
 
   res = xbt_new(s_xbt_cfgelm_t, 1);
   DEBUG8("Register cfg elm %s (%s) (%d to %d %s (=%d) @%p in set %p)",
-         name, desc, min, max, xbt_cfgelm_type_name[type], type, res, cfg);
+         name, desc, min, max, xbt_cfgelm_type_name[type], type, res, *cfg);
 
-  res->desc = desc;
+  res->desc = xbt_strdup(desc);
   res->type = type;
   res->min = min;
   res->max = max;
@@ -230,25 +234,33 @@ xbt_cfg_register(xbt_cfg_t cfg,
   switch (type) {
   case xbt_cfgelm_int:
     res->content = xbt_dynar_new(sizeof(int), NULL);
+    if (default_value)
+      xbt_dynar_push(res->content, default_value);
     break;
 
   case xbt_cfgelm_double:
     res->content = xbt_dynar_new(sizeof(double), NULL);
+    if (default_value)
+      xbt_dynar_push(res->content, default_value);
     break;
 
   case xbt_cfgelm_string:
     res->content = xbt_dynar_new(sizeof(char *), xbt_free_ref);
+    if (default_value)
+      xbt_dynar_push(res->content, default_value);
     break;
 
   case xbt_cfgelm_peer:
     res->content = xbt_dynar_new(sizeof(xbt_peer_t), xbt_peer_free_voidp);
+    if (default_value)
+      xbt_dynar_push(res->content, default_value);
     break;
 
   default:
     ERROR1("%d is an invalide type code", type);
   }
 
-  xbt_dict_set((xbt_dict_t) cfg, name, res, &xbt_cfgelm_free);
+  xbt_dict_set((xbt_dict_t) * cfg, name, res, &xbt_cfgelm_free);
 }
 
 /** @brief Unregister an element from a config set.
@@ -279,7 +291,7 @@ void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
  * @fixme: this does not allow to set the description
  */
 
-void xbt_cfg_register_str(xbt_cfg_t cfg, const char *entry)
+void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
 {
   char *entrycpy = xbt_strdup(entry);
   char *tok;
@@ -315,13 +327,72 @@ void xbt_cfg_register_str(xbt_cfg_t cfg, const char *entry)
               "Invalid type in config element descriptor: %s%s", entry,
               "; Should be one of 'string', 'int', 'peer' or 'double'.");
 
-  xbt_cfg_register(cfg, entrycpy, NULL, type, min, max, NULL, NULL);
+  xbt_cfg_register(cfg, entrycpy, NULL, type, NULL, min, max, NULL, NULL);
 
   free(entrycpy);               /* strdup'ed by dict mechanism, but cannot be const */
 }
 
-/** @brief Check that each variable have the right amount of values */
+/** @brief Displays the declared options and their description */
+void xbt_cfg_help(xbt_cfg_t cfg)
+{
+  xbt_dict_cursor_t cursor;
+  xbt_cfgelm_t variable;
+  char *name;
+
+  int i;
+  int size;
+
+  xbt_dict_foreach((xbt_dict_t) cfg, cursor, name, variable) {
+    printf("   %s: %s\n", name, variable->desc);
+    printf("       Type: %s; ", xbt_cfgelm_type_name[variable->type]);
+    if (variable->min != 1 || variable->max != 1)
+      printf("Arrity: min:%d to max:%d; ", variable->min, variable->max);
+    printf("Current value: ");
+    size = xbt_dynar_length(variable->content);
 
+    switch (variable->type) {
+      int ival;
+      char *sval;
+      double dval;
+      xbt_peer_t hval;
+
+    case xbt_cfgelm_int:
+      for (i = 0; i < size; i++) {
+        ival = xbt_dynar_get_as(variable->content, i, int);
+        printf("%s%d\n", (i == 0 ? "" : "              "), 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", (i == 0 ? "" : "              "), 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", (i == 0 ? "" : "              "), sval);
+      }
+      break;
+
+    case xbt_cfgelm_peer:
+      for (i = 0; i < size; i++) {
+        hval = xbt_dynar_get_as(variable->content, i, xbt_peer_t);
+        printf("%s%s:%d\n", (i == 0 ? "" : "              "), hval->name,
+               hval->port);
+      }
+      break;
+
+    default:
+      printf("Invalid type!!\n");
+    }
+
+  }
+}
+
+/** @brief Check that each variable have the right amount of values */
 void xbt_cfg_check(xbt_cfg_t cfg)
 {
   xbt_dict_cursor_t cursor;
@@ -358,9 +429,11 @@ static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg,
   xbt_cfgelm_t res = NULL;
 
   res = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
-  if (!res)
+  if (!res) {
+    xbt_cfg_help(cfg);
     THROW1(not_found_error, 0,
            "No registered variable '%s' in this config set", name);
+  }
 
   xbt_assert3(type == xbt_cfgelm_any || res->type == type,
               "You tried to access to the config element %s as an %s, but its type is %s.",
@@ -1033,7 +1106,7 @@ double xbt_cfg_get_double(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.
+ * xbt_cfg_get_dynar() instead. Returns NULL if there is no value.
  *
  * \warning the returned value is the actual content of the config set
  */
@@ -1046,6 +1119,8 @@ char *xbt_cfg_get_string(xbt_cfg_t cfg, const char *name)
     WARN2
       ("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_length(variable->content) == 0) {
+    return NULL;
   }
 
   return xbt_dynar_get_as(variable->content, 0, char *);
@@ -1164,11 +1239,10 @@ static xbt_cfg_t make_set()
 {
   xbt_cfg_t set = NULL;
 
-  xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg),xbt_log_priority_critical);
-  set = xbt_cfg_new();
-  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_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");
 
   return set;
 }                               /* end_of_make_set */