/* $Id$ */
-/* config - Dictionnary where the type of each cell is provided. */
+/* config - Dictionnary where the type of each variable is provided. */
/* This is useful to build named structs, like option or property sets. */
-/* Authors: Martin Quinson */
-/* Copyright (C) 2001,2002,2003,2004 the OURAGAN project. */
+/* Copyright (c) 2001,2002,2003,2004 Martin Quinson. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
-#include "gras_private.h" /* prototypes of this module */
+#include <stdio.h>
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/ex.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+#include "xbt/peer.h"
-GRAS_LOG_NEW_DEFAULT_CATEGORY(config);
+#include "xbt/config.h" /* prototypes of this module */
-/* gras_cfgelm_t: the typedef corresponding to a config cell.
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
+
+/* 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. */
typedef struct {
- /* Allowed type of the cell */
- gras_cfgelm_type_t type;
- int min,max;
+ /* Description */
+ char *desc;
- /* actual content
- (cannot be an union because type host uses both str and i) */
- gras_dynar_t *content;
-} gras_cfgelm_t;
+ /* Allowed type of the variable */
+ e_xbt_cfgelm_type_t type;
+ int min, max;
-static const char *gras_cfgelm_type_name[gras_cfgelm_type_count]=
- {"int","double","string","host"};
+ /* Callbacks */
+ xbt_cfg_cb_t cb_set;
+ xbt_cfg_cb_t cb_rm;
-/* Internal stuff used in cache to free a cell */
-static void gras_cfgelm_free(void *data);
+ /* actual content
+ (cannot be an union because type peer uses both str and i) */
+ xbt_dynar_t content;
+} s_xbt_cfgelm_t, *xbt_cfgelm_t;
-/* Retrieve the cell we'll modify */
-static gras_error_t gras_cfgelm_get(gras_cfg_t *cfg, const char *name,
- gras_cfgelm_type_t type,
- /* OUT */ gras_cfgelm_t **whereto);
+static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] =
+ { "int", "double", "string", "peer", "any" };
-void gras_cfg_str_free(void *d);
-void gras_cfg_host_free(void *d);
+/* Internal stuff used in cache to free a variable */
+static void xbt_cfgelm_free(void *data);
-void gras_cfg_str_free(void *d){
- free(*(void**)d);
-}
-void gras_cfg_host_free(void *d){
- gras_host_t *h=(gras_host_t*) *(void**)d;
- if (h) {
- if (h->name) free(h->name);
- free(h);
- }
-}
+/* 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);
/*----[ Memory management ]-----------------------------------------------*/
-/**
- * gras_cfg_new:
- *
- * @whereto:
+/** @brief Constructor
*
* Initialise an config set
*/
-gras_error_t gras_cfg_new(gras_cfg_t **whereto) {
- return gras_dict_new((gras_dict_t**)whereto);
+xbt_cfg_t xbt_cfg_new(void)
+{
+ return (xbt_cfg_t) xbt_dict_new();
}
-/**
- * gras_cfg_cpy:
+/** \brief Copy an existing configuration set
*
- * @whereto: the config set to be created
- * @tocopy: the source data
+ * \arg whereto the config set to be created
+ * \arg tocopy the source data
*
+ * This only copy the registrations, not the actual content
*/
-gras_error_t
-gras_cfg_cpy(gras_cfg_t **whereto, gras_cfg_t *tocopy) {
- gras_dict_cursor_t *cursor=NULL;
- gras_cfgelm_t *cell=NULL;
- char *name=NULL;
- int errcode=no_error;
-
- *whereto=NULL;
- gras_assert0(tocopy,"cannot copy NULL config");
-
- gras_dict_foreach((gras_dict_t*)tocopy,cursor,name,cell) {
- if ((errcode=gras_cfg_register(*whereto, name, cell->type,
- cell->min, cell->max)) != no_error) {
- if (cursor) gras_dict_cursor_free(cursor);
- if (*whereto) gras_cfg_free(whereto);
- return errcode;
- }
- }
+void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto)
+{
+ xbt_dict_cursor_t cursor = NULL;
+ xbt_cfgelm_t variable = NULL;
+ char *name = NULL;
+
+ DEBUG1("Copy cfg set %p", tocopy);
+ *whereto = NULL;
+ xbt_assert0(tocopy, "cannot copy NULL config");
- return errcode;
+ xbt_dict_foreach((xbt_dict_t) tocopy, cursor, name, variable) {
+ xbt_cfg_register(whereto, name, variable->desc, variable->type, NULL,
+ variable->min, variable->max, variable->cb_set,
+ variable->cb_rm);
+ }
}
-void gras_cfg_free(gras_cfg_t **cfg) {
- gras_dict_free((gras_dict_t**)cfg);
+/** @brief Destructor */
+void xbt_cfg_free(xbt_cfg_t * cfg)
+{
+ DEBUG1("Frees cfg set %p", cfg);
+ xbt_dict_free((xbt_dict_t *) cfg);
}
-/**
- * gras_cfg_dump:
- * @name: The name to give to this config set
- * @indent: what to write at the begining of each line (right number of spaces)
- * @cfg: the config set
+/** @brief Dump a config set for debuging purpose
*
- * Dumps a config set for debuging purpose
+ * \arg name The name to give to this config set
+ * \arg indent what to write at the begining of each line (right number of spaces)
+ * \arg cfg the config set
*/
-void
-gras_cfg_dump(const char *name,const char *indent,gras_cfg_t *cfg) {
- gras_dict_t *dict = (gras_dict_t*) cfg;
- gras_dict_cursor_t *cursor=NULL;
- gras_cfgelm_t *cell=NULL;
- char *key=NULL;
- int i;
- gras_error_t errcode;
+void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
+{
+ xbt_dict_t dict = (xbt_dict_t) cfg;
+ xbt_dict_cursor_t cursor = NULL;
+ xbt_cfgelm_t variable = NULL;
+ char *key = NULL;
+ int i;
int size;
int ival;
char *sval;
double dval;
- gras_host_t hval;
+ xbt_peer_t hval;
if (name)
- printf("%s>> Dumping of the config set '%s':\n",indent,name);
- gras_dict_foreach(dict,cursor,key,cell) {
- if ((errcode=gras_dict_cursor_get_key(cursor,(char**)&name)) != no_error ||
- (errcode=gras_dict_cursor_get_data(cursor,(void**)&cell)) != no_error) {
- gras_dict_cursor_free(cursor);
- return;
- }
+ printf("%s>> Dumping of the config set '%s':\n", indent, name);
+ xbt_dict_foreach(dict, cursor, key, variable) {
+
+ printf("%s %s:", indent, key);
- printf("%s %s:",indent,key);
- fflush(stdout);
+ size = xbt_dynar_length(variable->content);
+ printf
+ ("%d_to_%d_%s. Actual size=%d. prerm=%p,postset=%p, List of values:\n",
+ variable->min, variable->max, xbt_cfgelm_type_name[variable->type],
+ size, variable->cb_rm, variable->cb_set);
- size = gras_dynar_length(cell->content);
- printf("%d_to_%d_%s. Actual size=%d. List of values:\n",
- cell->min,cell->max,gras_cfgelm_type_name[cell->type],
- size);
+ switch (variable->type) {
- switch (cell->type) {
- case gras_cfgelm_int:
- for (i=0; i<size; i++) {
- gras_dynar_get(cell->content,i,&ival);
- printf ("%s %d\n",indent,ival);
+ 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 gras_cfgelm_double:
- for (i=0; i<size; i++) {
- gras_dynar_get(cell->content,i,&dval);
- printf ("%s %f\n",indent,dval);
+ 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 gras_cfgelm_string:
- for (i=0; i<size; i++) {
- gras_dynar_get(cell->content,i,&sval);
- printf ("%s %s\n",indent,sval);
+ 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 gras_cfgelm_host:
- for (i=0; i<size; i++) {
- gras_dynar_get(cell->content,i,&hval);
- printf ("%s %s:%d\n",indent,hval.name,hval.port);
+ 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", indent, hval->name, hval->port);
}
break;
default:
- printf("%s Invalid type!!\n",indent);
+ printf("%s Invalid type!!\n", indent);
}
}
- if (name) printf("%s<< End of the config set '%s'\n",indent,name);
+ if (name)
+ printf("%s<< End of the config set '%s'\n", indent, name);
+ fflush(stdout);
- gras_dict_cursor_free(cursor);
+ xbt_dict_cursor_free(&cursor);
return;
}
-/**
- * gras_cfgelm_free:
- *
- * @data: the data to be freed (typed as void* to be usable as free funct in dict)
- *
+/*
* free an config element
*/
-void gras_cfgelm_free(void *data) {
- gras_cfgelm_t *c=(gras_cfgelm_t *)data;
+void xbt_cfgelm_free(void *data)
+{
+ xbt_cfgelm_t c = (xbt_cfgelm_t) data;
- if (!c) return;
- gras_dynar_free(c->content);
+ DEBUG1("Frees cfgelm %p", c);
+ if (!c)
+ return;
+ xbt_free(c->desc);
+ xbt_dynar_free(&(c->content));
free(c);
}
/*----[ Registering stuff ]-----------------------------------------------*/
-/**
- * gras_cfg_register:
- * @cfg: the config set
- * @type: the type of the config element
- * @min: the minimum
- * @max: the maximum
+/** @brief Register an element within a config set
*
- * register an element within a config set
+ * @arg cfg the config set
+ * @arg type the type of the config element
+ * @arg min the minimum
+ * @arg max the maximum
*/
-gras_error_t
-gras_cfg_register(gras_cfg_t *cfg,
- const char *name, gras_cfgelm_type_t type,
- int min, int max){
- gras_cfgelm_t *res;
- gras_error_t errcode;
-
- TRYCATCH(mismatch_error,gras_dict_get((gras_dict_t*)cfg,name,(void**)&res));
-
- if (errcode != mismatch_error) {
- WARN1("Config elem %s registered twice.",name);
+void
+xbt_cfg_register(xbt_cfg_t * cfg,
+ const char *name, const char *desc, e_xbt_cfgelm_type_t type,
+ void *default_value, int min, int max, xbt_cfg_cb_t cb_set,
+ xbt_cfg_cb_t cb_rm)
+{
+ xbt_cfgelm_t res;
+
+ 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);
+
+ if (res) {
+ WARN1("Config elem %s registered twice.", name);
/* Will be removed by the insertion of the new one */
- }
+ }
- res=malloc(sizeof(gras_cfgelm_t));
- if (!res)
- RAISE_MALLOC;
+ 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);
- res->type=type;
- res->min=min;
- res->max=max;
+ res->desc = xbt_strdup(desc);
+ res->type = type;
+ res->min = min;
+ res->max = max;
+ res->cb_set = cb_set;
+ res->cb_rm = cb_rm;
switch (type) {
- case gras_cfgelm_int:
- TRY(gras_dynar_new(&(res->content), sizeof(int), NULL));
+ case xbt_cfgelm_int:
+ res->content = xbt_dynar_new(sizeof(int), NULL);
+ if (default_value)
+ xbt_dynar_push(res->content, default_value);
break;
- case gras_cfgelm_double:
- TRY(gras_dynar_new(&(res->content), sizeof(double), NULL));
+ case xbt_cfgelm_double:
+ res->content = xbt_dynar_new(sizeof(double), NULL);
+ if (default_value)
+ xbt_dynar_push(res->content, default_value);
break;
- case gras_cfgelm_string:
- TRY(gras_dynar_new(&(res->content),sizeof(char*),&gras_cfg_str_free));
- 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 gras_cfgelm_host:
- TRY(gras_dynar_new(&(res->content),sizeof(gras_host_t*),&gras_cfg_host_free));
- 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);
+ ERROR1("%d is an invalide type code", type);
}
-
- return gras_dict_set((gras_dict_t*)cfg,name,res,&gras_cfgelm_free);
+
+ xbt_dict_set((xbt_dict_t) * cfg, name, res, &xbt_cfgelm_free);
}
-/**
- * gras_cfg_unregister:
- *
- * @cfg: the config set
- * @name: the name of the elem to be freed
- *
- * unregister an element from a config set.
- * Note that it removes both the DTD and the actual content.
+/** @brief Unregister an element from a config set.
+ *
+ * @arg cfg the config set
+ * @arg name the name of the elem to be freed
+ *
+ * Note that it removes both the description and the actual content.
+ * Throws not_found when no such element exists.
*/
-gras_error_t
-gras_cfg_unregister(gras_cfg_t *cfg,const char *name) {
- return gras_dict_remove((gras_dict_t*)cfg,name);
+void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
+{
+ DEBUG2("Unregister elm '%s' from set %p", name, cfg);
+ xbt_dict_remove((xbt_dict_t) cfg, name);
}
/**
- * gras_cfg_register_str:
+ * @brief Parse a string and register the stuff described.
*
- * @cfg: the config set
- * @entry: a string describing the element to register
+ * @arg cfg the config set
+ * @arg entry a string describing the element to register
*
- * Parse a string and register the stuff described.
+ * 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', 'peer' or 'double'.
+ *
+ * @fixme: this does not allow to set the description
*/
-gras_error_t
-gras_cfg_register_str(gras_cfg_t *cfg,const char *entry) {
- char *entrycpy=strdup(entry);
+void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
+{
+ char *entrycpy = xbt_strdup(entry);
char *tok;
- int min,max;
- gras_cfgelm_type_t type;
-
- gras_error_t errcode;
+ int min, max;
+ e_xbt_cfgelm_type_t type;
+ DEBUG1("Register string '%s'", entry);
- tok=strchr(entrycpy, ':');
- if (!tok) {
- ERROR3("%s%s%s",
- "Invalid config element descriptor: ",entry,
- "; Should be <name>:<min nb>_to_<max nb>_<type>");
- free(entrycpy);
- gras_abort();
- }
- *(tok++)='\0';
+ tok = strchr(entrycpy, ':');
+ xbt_assert2(tok, "Invalid config element descriptor: %s%s",
+ entry, "; Should be <name>:<min nb>_to_<max nb>_<type>");
+ *(tok++) = '\0';
- min=strtol(tok, &tok, 10);
- if (!tok) {
- ERROR1("Invalid minimum in config element descriptor %s",entry);
- free(entrycpy);
- gras_abort();
- }
+ min = strtol(tok, &tok, 10);
+ xbt_assert1(tok, "Invalid minimum in config element descriptor %s", entry);
- if (!strcmp(tok,"_to_")){
- ERROR3("%s%s%s",
- "Invalid config element descriptor: ",entry,
- "; Should be <name>:<min nb>_to_<max nb>_<type>");
- free(entrycpy);
- gras_abort();
- }
+ xbt_assert2(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);
- if (!tok) {
- ERROR1("Invalid maximum in config element descriptor %s",entry);
- free(entrycpy);
- gras_abort();
- }
+ max = strtol(tok, &tok, 10);
+ xbt_assert1(tok, "Invalid maximum in config element descriptor %s", entry);
- if (*(tok++)!='_') {
- ERROR3("%s%s%s",
- "Invalid config element descriptor: ",entry,
- "; Should be <name>:<min nb>_to_<max nb>_<type>");
- free(entrycpy);
- gras_abort();
- }
+ xbt_assert2(*(tok++) == '_',
+ "Invalid config element descriptor: %s%s", entry,
+ "; Should be <name>:<min nb>_to_<max nb>_<type>");
- for (type=0;
- type<gras_cfgelm_type_count && strcmp(tok,gras_cfgelm_type_name[type]);
- type++);
- if (type == gras_cfgelm_type_count) {
- ERROR3("%s%s%s",
- "Invalid type in config element descriptor: ",entry,
- "; Should be one of 'string', 'int', 'host' or 'double'.");
- free(entrycpy);
- gras_abort();
- }
+ for (type = 0;
+ type < xbt_cfgelm_type_count
+ && strcmp(tok, xbt_cfgelm_type_name[type]); type++);
+ xbt_assert2(type < xbt_cfgelm_type_count,
+ "Invalid type in config element descriptor: %s%s", entry,
+ "; Should be one of 'string', 'int', 'peer' or 'double'.");
- TRYCLEAN(gras_cfg_register(cfg,entrycpy,type,min,max),
- free(entrycpy));
+ xbt_cfg_register(cfg, entrycpy, NULL, type, NULL, min, max, NULL, NULL);
- free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
- return no_error;
+ free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
}
-/**
- * gras_cfg_check:
- *
- * @cfg: the config set
- *
- * Check the config set
- */
-
-gras_error_t
-gras_cfg_check(gras_cfg_t *cfg) {
- gras_dict_cursor_t *cursor;
- gras_cfgelm_t *cell;
+/** @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;
- gras_assert0(cfg,"NULL config set.");
-
- gras_dict_foreach((gras_dict_t*)cfg,cursor,name,cell) {
- size = gras_dynar_length(cell->content);
- if (cell->min > size) {
- ERROR4("Config elem %s needs at least %d %s, but there is only %d values.",
- name,
- cell->min,
- gras_cfgelm_type_name[cell->type],
- size);
- return mismatch_error;
+ 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");
}
- if (cell->max < size) {
- ERROR4("Config elem %s accepts at most %d %s, but there is %d values.",
- name,
- cell->max,
- gras_cfgelm_type_name[cell->type],
- size);
- return mismatch_error;
+ }
+}
+
+/** @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_assert0(cfg, "NULL config set.");
+ DEBUG1("Check cfg set %p", cfg);
+
+ xbt_dict_foreach((xbt_dict_t) cfg, cursor, name, variable) {
+ size = xbt_dynar_length(variable->content);
+ if (variable->min > size) {
+ xbt_dict_cursor_free(&cursor);
+ THROW4(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->max > 0 && variable->max < size) {
+ xbt_dict_cursor_free(&cursor);
+ THROW4(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);
+ }
}
- return no_error;
+ xbt_dict_cursor_free(&cursor);
}
-static gras_error_t gras_cfgelm_get(gras_cfg_t *cfg,
- const char *name,
- gras_cfgelm_type_t type,
- /* OUT */ gras_cfgelm_t **whereto){
- gras_error_t errcode;
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg,
+ const char *name, e_xbt_cfgelm_type_t type)
+{
+ xbt_cfgelm_t res = NULL;
- TRYCATCH(mismatch_error,gras_dict_get((gras_dict_t*)cfg,name,(void**)whereto));
-
- if (errcode == mismatch_error) {
- ERROR1("No registered cell %s in this config set",
- name);
- return mismatch_error;
+ res = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
+ if (!res) {
+ xbt_cfg_help(cfg);
+ THROW1(not_found_error, 0,
+ "No registered variable '%s' in this config set", name);
}
- gras_assert3((*whereto)->type == type,
- "You tried to access to the config element %s as an %s, but its type is %s.",
- name,
- gras_cfgelm_type_name[type],
- gras_cfgelm_type_name[(*whereto)->type]);
+ 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.",
+ name,
+ xbt_cfgelm_type_name[type], xbt_cfgelm_type_name[res->type]);
- return no_error;
+ return res;
}
-/**
- * gras_cfg_get_type:
+/** @brief Get the type of this variable in that configuration set
*
- * @cfg: the config set
- * @name: the name of the element
- * @type: the result
+ * \arg cfg the config set
+ * \arg name the name of the element
+ * \arg type the result
*
- * Give the type of the config element
*/
-gras_error_t
-gras_cfg_get_type(gras_cfg_t *cfg, const char *name,
- /* OUT */gras_cfgelm_type_t *type) {
+e_xbt_cfgelm_type_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name)
+{
- gras_cfgelm_t *cell;
- gras_error_t errcode;
+ xbt_cfgelm_t variable = NULL;
- TRYCATCH(mismatch_error,gras_dict_get((gras_dict_t*)cfg,name,(void**)&cell));
-
- if (errcode == mismatch_error) {
- ERROR1("Can't get the type of '%s' since this cell does not exist",
- name);
- return mismatch_error;
- }
+ variable = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
+ if (!variable)
+ THROW1(not_found_error, 0,
+ "Can't get the type of '%s' since this variable does not exist",
+ name);
- *type=cell->type;
+ INFO1("type in variable = %d", variable->type);
- return no_error;
+ return variable->type;
}
/*----[ Setting ]---------------------------------------------------------*/
-/**
- * gras_cfg_set_vargs():
- * @cfg: config set to fill
- * @varargs: NULL-terminated list of pairs {(const char*)key, value}
+/** @brief va_args version of xbt_cfg_set
+ *
+ * \arg cfg config set to fill
+ * \arg n variable name
+ * \arg pa variable value
*
* Add some values to the config set.
- * @warning: if the list isn't NULL terminated, it will segfault.
*/
-gras_error_t
-gras_cfg_set_vargs(gras_cfg_t *cfg, va_list pa) {
- char *str,*name;
+void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
+{
+ char *str;
int i;
double d;
- gras_cfgelm_type_t type;
+ e_xbt_cfgelm_type_t type = 0; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
- gras_error_t errcode;
-
- while ((name=va_arg(pa,char *))) {
+ xbt_ex_t e;
- if (!gras_cfg_get_type(cfg,name,&type)) {
- ERROR1("Can't set the property '%s' since it's not registered",name);
- return mismatch_error;
+ TRY {
+ type = xbt_cfg_get_type(cfg, name);
+ } CATCH(e) {
+ if (e.category == not_found_error) {
+ xbt_ex_free(e);
+ THROW1(not_found_error, 0,
+ "Can't set the property '%s' since it's not registered", name);
}
+ RETHROW;
+ }
- switch (type) {
- case gras_cfgelm_host:
- str = va_arg(pa, char *);
- i=va_arg(pa,int);
- TRY(gras_cfg_set_host(cfg,name,str,i));
- break;
-
- case gras_cfgelm_string:
- str=va_arg(pa, char *);
- TRY(gras_cfg_set_string(cfg, name, str));
- break;
+ switch (type) {
+ case xbt_cfgelm_peer:
+ str = va_arg(pa, char *);
+ i = va_arg(pa, int);
+ xbt_cfg_set_peer(cfg, name, str, i);
+ break;
- case gras_cfgelm_int:
- i=va_arg(pa,int);
- TRY(gras_cfg_set_int(cfg,name,i));
- break;
+ case xbt_cfgelm_string:
+ str = va_arg(pa, char *);
+ xbt_cfg_set_string(cfg, name, str);
+ break;
- case gras_cfgelm_double:
- d=va_arg(pa,double);
- TRY(gras_cfg_set_double(cfg,name,d));
- break;
+ case xbt_cfgelm_int:
+ i = va_arg(pa, int);
+ xbt_cfg_set_int(cfg, name, i);
+ break;
- default:
- RAISE1(unknown_error,"Config element cell %s not valid.",name);
- }
+ case xbt_cfgelm_double:
+ d = va_arg(pa, double);
+ xbt_cfg_set_double(cfg, name, d);
+ break;
+
+ default:
+ xbt_assert2(0, "Config element variable %s not valid (type=%d)", name,
+ type);
}
- return no_error;
}
-/**
- * gras_cfg_set():
- * @cfg: config set to fill
- * @varargs: NULL-terminated list of pairs {(const char*)key, value}
+/** @brief Add a NULL-terminated list of pairs {(char*)key, value} to the set
+ *
+ * \arg cfg config set to fill
+ * \arg name variable name
+ * \arg varargs variable value
*
- * Add some values to the config set.
- * @warning: if the list isn't NULL terminated, it will segfault.
*/
-gras_error_t gras_cfg_set(gras_cfg_t *cfg, ...) {
+void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...)
+{
va_list pa;
- gras_error_t errcode;
- va_start(pa,cfg);
- errcode=gras_cfg_set_vargs(cfg,pa);
+ va_start(pa, name);
+ xbt_cfg_set_vargs(cfg, name, pa);
va_end(pa);
- return errcode;
}
-/**
- * gras_cfg_set_parse():
- * @cfg: config set to fill
- * @options: a string containing the content to add to the config set. This
- * is a '\t',' ' or '\n' separated list of cells. Each individual cell is
- * like "[name]:[value]" where [name] is the name of an already registred
- * cell, and [value] conforms to the data type under which this cell was
+/** @brief Add values parsed from a string into a config set
+ *
+ * \arg cfg config set to fill
+ * \arg 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.
*
- * Add the cells described in a string to a config set.
+ * @todo This is a crude manual parser, it should be a proper lexer.
*/
-gras_error_t
-gras_cfg_set_parse(gras_cfg_t *cfg, const char *options) {
+void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options)
+{
+ xbt_ex_t e;
+
int i;
double d;
char *str;
- gras_cfgelm_t *cell;
+ xbt_cfgelm_t variable = NULL;
char *optionlist_cpy;
- char *option, *name,*val;
+ char *option, *name, *val;
int len;
- gras_error_t errcode;
- if (!options || !strlen(options)) { /* nothing to do */
- return no_error;
+ XBT_IN;
+ if (!options || !strlen(options)) { /* nothing to do */
+ return;
}
- optionlist_cpy=strdup(options);
+ optionlist_cpy = xbt_strdup(options);
- DEBUG1("Options list='%s'",options);
- option=optionlist_cpy;
- while (1) { /* breaks in the code */
+ DEBUG1("List to parse and set:'%s'", options);
+ option = optionlist_cpy;
+ while (1) { /* breaks in the code */
- if (!option)
+ if (!option)
break;
- name=option;
- len=strlen(name);
- DEBUG3("Parse list '%s'. len=%d; option-name=%d",name,len,option-name);
+ name = option;
+ len = strlen(name);
+ DEBUG3("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') {
- //fprintf(stderr,"Take %c.\n",*option);
+ while (option - name <= (len - 1) && *option != ' ' && *option != '\n'
+ && *option != '\t' && *option != ',') {
+ DEBUG1("Take %c.", *option);
option++;
}
- if (option-name == len) {
- //fprintf(stderr,"Boundary=EOL\n");
- option=NULL; /* don't do next iteration */
+ if (option - name == len) {
+ DEBUG0("Boundary=EOL");
+ option = NULL; /* don't do next iteration */
} else {
- //fprintf(stderr,"Boundary on '%c'. len=%d;option-name=%d\n",*option,len,option-name);
+ DEBUG3("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')) {
- // fprintf(stderr,"Ignore a blank char.\n");
- option++;
+ *(option++) = '\0';
+ while (option - name < (len - 1) &&
+ (*option == ' ' || *option == '\n' || *option == '\t')) {
+ /* fprintf(stderr,"Ignore a blank char.\n"); */
+ option++;
}
- if (option-name == len-1)
- option=NULL; /* don't do next iteration */
+ if (option - name == len - 1)
+ option = NULL; /* don't do next iteration */
}
- DEBUG2("this='%s';rest='%s'",name,option);
+ DEBUG2("parse now:'%s'; parse later:'%s'", name, option);
if (name[0] == ' ' || name[0] == '\n' || name[0] == '\t')
continue;
if (!strlen(name))
break;
-
- val=strchr(name,':');
+
+ val = strchr(name, ':');
if (!val) {
free(optionlist_cpy);
- gras_assert1(FALSE,
- "Malformated option: '%s'; Should be of the form 'name:value'",
- name);
+ xbt_assert1(FALSE,
+ "Option '%s' badly formated. Should be of the form 'name:value'",
+ name);
}
- *(val++)='\0';
+ *(val++) = '\0';
- DEBUG2("name='%s';val='%s'",name,val);
+ INFO2("Configuration change: Set '%s' to '%s'", name, val);
- errcode=gras_dict_get((gras_dict_t*)cfg,name,(void**)&cell);
- switch (errcode) {
- case no_error:
- break;
- case mismatch_error:
- ERROR1("No registrated cell corresponding to '%s'.",name);
- free(optionlist_cpy);
- return mismatch_error;
- break;
- default:
- free(optionlist_cpy);
- return errcode;
+ TRY {
+ variable = xbt_dict_get((xbt_dict_t) cfg, name);
}
-
- switch (cell->type) {
- case gras_cfgelm_string:
- TRYCLEAN(gras_cfg_set_string(cfg, name, val),
- free(optionlist_cpy));
- break;
-
- case gras_cfgelm_int:
- i=strtol(val, &val, 0);
- if (val==NULL) {
- free(optionlist_cpy);
- gras_assert1(FALSE,
- "Value of option %s not valid. Should be an integer",
- name);
- }
-
- TRYCLEAN(gras_cfg_set_int(cfg,name,i),
- free(optionlist_cpy));
- break;
-
- case gras_cfgelm_double:
- d=strtod(val, &val);
- if (val==NULL) {
- free(optionlist_cpy);
- gras_assert1(FALSE,
- "Value of option %s not valid. Should be a double",
- name);
- }
-
- TRYCLEAN(gras_cfg_set_double(cfg,name,d),
- free(optionlist_cpy));
- break;
-
- case gras_cfgelm_host:
- str=val;
- val=strchr(val,':');
- if (!val) {
- free(optionlist_cpy);
- gras_assert1(FALSE,
- "Value of option %s not valid. Should be an host (machine:port)",
- name);
+ CATCH(e) {
+ /* put it back on what won't get freed, ie within "options" and out of "optionlist_cpy" */
+ name = (char *) (optionlist_cpy - name + options);
+ free(optionlist_cpy);
+ if (e.category == not_found_error) {
+ xbt_ex_free(e);
+ THROW1(not_found_error, 0,
+ "No registrated variable corresponding to '%s'.", name);
}
+ RETHROW;
+ }
- *(val++)='\0';
- i=strtol(val, &val, 0);
- if (val==NULL) {
- free(optionlist_cpy);
- gras_assert1(FALSE,
- "Value of option %s not valid. Should be an host (machine:port)",
- name);
+ TRY {
+ switch (variable->type) {
+ case xbt_cfgelm_string:
+ xbt_cfg_set_string(cfg, name, val); /* throws */
+ break;
+
+ case xbt_cfgelm_int:
+ i = strtol(val, &val, 0);
+ if (val == NULL) {
+ free(optionlist_cpy);
+ xbt_assert1(FALSE,
+ "Value of option %s not valid. Should be an integer",
+ name);
+ }
+
+ xbt_cfg_set_int(cfg, name, i); /* throws */
+ break;
+
+ case xbt_cfgelm_double:
+ d = strtod(val, &val);
+ if (val == NULL) {
+ free(optionlist_cpy);
+ xbt_assert1(FALSE,
+ "Value of option %s not valid. Should be a double",
+ name);
+ }
+
+ xbt_cfg_set_double(cfg, name, d); /* throws */
+ break;
+
+ case xbt_cfgelm_peer:
+ str = val;
+ val = strchr(val, ':');
+ if (!val) {
+ free(optionlist_cpy);
+ xbt_assert1(FALSE,
+ "Value of option %s not valid. Should be an peer (machine:port)",
+ name);
+ }
+
+ *(val++) = '\0';
+ i = strtol(val, &val, 0);
+ if (val == NULL) {
+ free(optionlist_cpy);
+ xbt_assert1(FALSE,
+ "Value of option %s not valid. Should be an peer (machine:port)",
+ name);
+ }
+
+ xbt_cfg_set_peer(cfg, name, str, i); /* throws */
+ break;
+
+ default:
+ THROW1(unknown_error, 0, "Type of config element %s is not valid.",
+ name);
}
-
- TRYCLEAN(gras_cfg_set_host(cfg,name,str,i),
- free(optionlist_cpy));
- break;
-
- default:
+ }
+ CATCH(e) {
free(optionlist_cpy);
- RAISE1(unknown_error,"Type of config element %s is not valid.",name);
+ RETHROW;
}
-
}
free(optionlist_cpy);
- return no_error;
+
}
-/**
- * gras_cfg_set_int:
+/** @brief Set or add an integer value to \a name within \a cfg
*
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the value of the cell
- *
- * Set the value of the cell @name in @cfg with the provided value.
- */
-gras_error_t
-gras_cfg_set_int(gras_cfg_t *cfg,const char*name, int val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the value of the variable
+ */
+void xbt_cfg_set_int(xbt_cfg_t cfg, const char *name, int val)
+{
+ xbt_cfgelm_t variable;
+
+ VERB2("Configuration setting: %s=%d", name, val);
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_int,&cell));
+ if (variable->max == 1) {
+ if (variable->cb_rm && xbt_dynar_length(variable->content))
+ (*variable->cb_rm) (name, 0);
- if (cell->max > 1) {
- return gras_dynar_push(cell->content,&val);
+ xbt_dynar_set(variable->content, 0, &val);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ if (variable->max
+ && xbt_dynar_length(variable->content) ==
+ (unsigned long) variable->max)
+ THROW3(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);
}
+
+ if (variable->cb_set)
+ (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1);
}
-/**
- * gras_cfg_set_double:
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the doule to set
- *
- * Set the value of the cell @name in @cfg with the provided value.
- */
-
-gras_error_t
-gras_cfg_set_double(gras_cfg_t *cfg,const char*name, double val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_double,&cell));
-
- if (cell->max > 1) {
- return gras_dynar_push(cell->content,&val);
+/** @brief Set or add a double value to \a name within \a cfg
+ *
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the doule to set
+ */
+
+void xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, double val)
+{
+ xbt_cfgelm_t variable;
+
+ VERB2("Configuration setting: %s=%f", name, val);
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
+
+ if (variable->max == 1) {
+ if (variable->cb_rm && xbt_dynar_length(variable->content))
+ (*variable->cb_rm) (name, 0);
+
+ xbt_dynar_set(variable->content, 0, &val);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ if (variable->max && xbt_dynar_length(variable->content) == variable->max)
+ THROW3(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);
}
+
+ if (variable->cb_set)
+ (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1);
}
-/**
- * gras_cfg_set_string:
- *
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the value to be added
+/** @brief Set or add a string value to \a name within \a cfg
*
- * Set the value of the cell @name in @cfg with the provided value.
- */
-
-gras_error_t
-gras_cfg_set_string(gras_cfg_t *cfg,const char*name, const char*val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the value to be added
+ *
+ */
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_string,&cell));
+void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val)
+{
+ xbt_cfgelm_t variable;
+ char *newval = xbt_strdup(val);
+
+ VERB2("Configuration setting: %s=%s", name, val);
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
+ DEBUG5("Variable: %d to %d %s (=%d) @%p",
+ variable->min, variable->max, xbt_cfgelm_type_name[variable->type],
+ variable->type, variable);
+
+ if (variable->max == 1) {
+ if (xbt_dynar_length(variable->content)) {
+ if (variable->cb_rm)
+ (*variable->cb_rm) (name, 0);
+ else if (variable->type == xbt_cfgelm_string) {
+ char *sval = xbt_dynar_get_as(variable->content, 0, char *);
+ free(sval);
+ }
+ }
- if (cell->max > 1) {
- return gras_dynar_push(cell->content,&val);
+ xbt_dynar_set(variable->content, 0, &newval);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ if (variable->max && xbt_dynar_length(variable->content) == variable->max)
+ THROW3(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 (variable->cb_set)
+ (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1);
}
-/**
- * gras_cfg_set_host:
- *
- * @cfg: the config set
- * @name: the name of the cell
- * @host: the host
- * @port: the port number
+/** @brief Set or add an peer value to \a name within \a cfg
*
- * Set the value of the cell @name in @cfg with the provided value
- * on the given @host to the given @port
- */
-
-gras_error_t
-gras_cfg_set_host(gras_cfg_t *cfg,const char*name,
- const char *host,int port) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
- gras_host_t *val=malloc(sizeof(gras_host_t));
-
- if (!val)
- RAISE_MALLOC;
- val->name = strdup(name);
- val->port = port;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_host,&cell));
-
- if (cell->max > 1) {
- return gras_dynar_push(cell->content,&val);
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg peer the peer
+ * \arg port the port number
+ *
+ * \e peer values are composed of a string (peername) and an integer (port)
+ */
+
+void
+xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port)
+{
+ xbt_cfgelm_t variable;
+ xbt_peer_t val = xbt_peer_new(peer, port);
+
+ VERB3("Configuration setting: %s=%s:%d", name, peer, port);
+
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
+
+ if (variable->max == 1) {
+ if (variable->cb_rm && xbt_dynar_length(variable->content))
+ (*variable->cb_rm) (name, 0);
+
+ xbt_dynar_set(variable->content, 0, &val);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ if (variable->max && xbt_dynar_length(variable->content) == variable->max)
+ THROW4(mismatch_error, 0,
+ "Cannot add value %s:%d to the config element %s since it's already full (size=%d)",
+ peer, port, name, variable->max);
+
+ xbt_dynar_push(variable->content, &val);
}
+
+ if (variable->cb_set)
+ (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1);
}
/* ---- [ Removing ] ---- */
-/**
- * gras_cfg_rm_int:
+/** @brief Remove the provided \e val integer value from a variable
*
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the value to be removed
- *
- * Remove the provided @val from the cell @name in @cfg.
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the value to be removed
*/
-gras_error_t gras_cfg_rm_int (gras_cfg_t *cfg,const char*name, int val) {
+void xbt_cfg_rm_int(xbt_cfg_t cfg, const char *name, int val)
+{
+
+ xbt_cfgelm_t variable;
+ unsigned int cpt;
+ int seen;
- gras_cfgelm_t *cell;
- int cpt,seen;
- gras_error_t errcode;
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_int,&cell));
-
- gras_dynar_foreach(cell->content,cpt,seen) {
+ if (xbt_dynar_length(variable->content) == variable->min)
+ THROW3(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) {
- gras_dynar_cursor_rm(cell->content,&cpt);
- return no_error;
+ if (variable->cb_rm)
+ (*variable->cb_rm) (name, cpt);
+ xbt_dynar_cursor_rm(variable->content, &cpt);
+ return;
}
}
- ERROR2("Can't remove the value %d of config element %s: value not found.",
- val,name);
- return mismatch_error;
+ THROW2(not_found_error, 0,
+ "Can't remove the value %d of config element %s: value not found.",
+ val, name);
}
-/**
- * gras_cfg_rm_double:
- *
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the value to be removed
+/** @brief Remove the provided \e val double value from a variable
*
- * Remove the provided @val from the cell @name in @cfg.
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the value to be removed
*/
-gras_error_t gras_cfg_rm_double(gras_cfg_t *cfg,const char*name, double val) {
- gras_cfgelm_t *cell;
- int cpt;
+void xbt_cfg_rm_double(xbt_cfg_t cfg, const char *name, double val)
+{
+ xbt_cfgelm_t variable;
+ unsigned int cpt;
double seen;
- gras_error_t errcode;
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_double,&cell));
-
- gras_dynar_foreach(cell->content,cpt,seen) {
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
+
+ if (xbt_dynar_length(variable->content) == variable->min)
+ THROW3(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) {
- gras_dynar_cursor_rm(cell->content,&cpt);
- return no_error;
+ xbt_dynar_cursor_rm(variable->content, &cpt);
+ if (variable->cb_rm)
+ (*variable->cb_rm) (name, cpt);
+ return;
}
}
- ERROR2("Can't remove the value %f of config element %s: value not found.",
- val,name);
- return mismatch_error;
+ THROW2(not_found_error, 0,
+ "Can't remove the value %f of config element %s: value not found.",
+ val, name);
}
-/**
- * gras_cfg_rm_string:
+/** @brief Remove the provided \e val string value from a variable
*
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the value of the string which will be removed
- *
- * Remove the provided @val from the cell @name in @cfg.
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the value of the string which will be removed
*/
-gras_error_t
-gras_cfg_rm_string(gras_cfg_t *cfg,const char*name, const char *val) {
- gras_cfgelm_t *cell;
- int cpt;
+void xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name, const char *val)
+{
+ xbt_cfgelm_t variable;
+ unsigned int cpt;
char *seen;
- gras_error_t errcode;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_string,&cell));
-
- gras_dynar_foreach(cell->content,cpt,seen) {
- if (!strcpy(seen,val)) {
- gras_dynar_cursor_rm(cell->content,&cpt);
- return no_error;
+
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
+
+ if (xbt_dynar_length(variable->content) == variable->min)
+ THROW3(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)) {
+ if (variable->cb_rm)
+ (*variable->cb_rm) (name, cpt);
+ xbt_dynar_cursor_rm(variable->content, &cpt);
+ return;
}
}
- ERROR2("Can't remove the value %s of config element %s: value not found.",
- val,name);
- return mismatch_error;
+ THROW2(not_found_error, 0,
+ "Can't remove the value %s of config element %s: value not found.",
+ val, name);
}
-/**
- * gras_cfg_rm_host:
- *
- * @cfg: the config set
- * @name: the name of the cell
- * @host: the hostname
- * @port: the port number
+/** @brief Remove the provided \e val peer value from a variable
*
- * Remove the provided @host:@port from the cell @name in @cfg.
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg peer the peername
+ * \arg port the port number
*/
-gras_error_t
-gras_cfg_rm_host (gras_cfg_t *cfg,const char*name, const char *host,int port) {
- gras_cfgelm_t *cell;
- int cpt;
- gras_host_t *seen;
- gras_error_t errcode;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_host,&cell));
-
- gras_dynar_foreach(cell->content,cpt,seen) {
- if (!strcpy(seen->name,host) && seen->port == port) {
- gras_dynar_cursor_rm(cell->content,&cpt);
- return no_error;
+void
+xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port)
+{
+ xbt_cfgelm_t variable;
+ unsigned int cpt;
+ xbt_peer_t seen;
+
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
+
+ if (xbt_dynar_length(variable->content) == variable->min)
+ THROW4(mismatch_error, 0,
+ "Cannot remove value %s:%d from the config element %s since it's already at its minimal size (=%d)",
+ peer, port, name, variable->min);
+
+ xbt_dynar_foreach(variable->content, cpt, seen) {
+ if (!strcpy(seen->name, peer) && seen->port == port) {
+ if (variable->cb_rm)
+ (*variable->cb_rm) (name, cpt);
+ xbt_dynar_cursor_rm(variable->content, &cpt);
+ return;
}
}
- ERROR3("Can't remove the value %s:%d of config element %s: value not found.",
- host,port,name);
- return mismatch_error;
+ THROW3(not_found_error, 0,
+ "Can't remove the value %s:%d of config element %s: value not found.",
+ peer, port, name);
}
-/* rm everything */
+/** @brief Remove the \e pos th value from the provided variable */
-/**
- * gras_cfg_empty:
- *
- * @cfg: the config set
- * @name: the name of the cell
- *
- * rm evenything
- */
+void xbt_cfg_rm_at(xbt_cfg_t cfg, const char *name, int pos)
+{
+
+ xbt_cfgelm_t variable;
-gras_error_t
-gras_cfg_empty(gras_cfg_t *cfg,const char*name) {
- gras_cfgelm_t *cell;
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_any);
- gras_error_t errcode;
+ if (xbt_dynar_length(variable->content) == variable->min)
+ THROW3(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);
- TRYCATCH(mismatch_error,
- gras_dict_get((gras_dict_t*)cfg,name,(void**)&cell));
- if (errcode == mismatch_error) {
- ERROR1("Can't empty '%s' since this config element does not exist",
- name);
- return mismatch_error;
+ if (variable->cb_rm)
+ (*variable->cb_rm) (name, pos);
+ xbt_dynar_remove_at(variable->content, pos, NULL);
+}
+
+/** @brief Remove all the values from a variable
+ *
+ * \arg cfg the config set
+ * \arg 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);
+ THROW1(not_found_error, 0,
+ "Can't empty '%s' since this config element does not exist",
+ name);
}
- if (cell) {
- gras_dynar_reset(cell->content);
+ if (variable) {
+ if (variable->cb_rm) {
+ unsigned int cpt;
+ void *ignored;
+ xbt_dynar_foreach(variable->content, cpt, ignored) {
+ (*variable->cb_rm) (name, cpt);
+ }
+ }
+ xbt_dynar_reset(variable->content);
}
- return no_error;
}
/*----[ Getting ]---------------------------------------------------------*/
-/**
- * gras_cfg_get_int:
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the wanted value
+/** @brief Retrieve an integer value of a variable (get a warning if not uniq)
+ *
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the wanted value
*
* 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 gras_cfg_get_dynar()
- * instead.
+ * If there is more than one value, it will issue a warning. Consider using
+ * xbt_cfg_get_dynar() instead.
*
- * @warning the returned value is the actual content of the config set
+ * \warning the returned value is the actual content of the config set
*/
-gras_error_t
-gras_cfg_get_int (gras_cfg_t *cfg,
- const char *name,
- int *val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_int,&cell));
-
- if (gras_dynar_length(cell->content) > 1) {
- WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
- name, gras_dynar_length(cell->content));
+int xbt_cfg_get_int(xbt_cfg_t cfg, const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
+
+ if (xbt_dynar_length(variable->content) > 1) {
+ WARN2
+ ("You asked for the first value of the config element '%s', but there is %lu values",
+ name, xbt_dynar_length(variable->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
- return no_error;
+ return xbt_dynar_get_as(variable->content, 0, int);
}
-/**
- * gras_cfg_get_double:
- * @cfg: the config set
- * @name: the name of the cell
- * @val: the wanted value
+/** @brief Retrieve a double value of a variable (get a warning if not uniq)
+ *
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg val the wanted value
*
* 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 gras_cfg_get_dynar()
- * instead.
+ * If there is more than one value, it will issue a warning. Consider using
+ * xbt_cfg_get_dynar() instead.
*
- * @warning the returned value is the actual content of the config set
+ * \warning the returned value is the actual content of the config set
*/
-gras_error_t
-gras_cfg_get_double(gras_cfg_t *cfg,
- const char *name,
- double *val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
+double xbt_cfg_get_double(xbt_cfg_t cfg, const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_double,&cell));
-
- if (gras_dynar_length(cell->content) > 1) {
- WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
- name, gras_dynar_length(cell->content));
+ if (xbt_dynar_length(variable->content) > 1) {
+ WARN2
+ ("You asked for the first value of the config element '%s', but there is %lu values\n",
+ name, xbt_dynar_length(variable->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
- return no_error;
+ return xbt_dynar_get_as(variable->content, 0, double);
}
-/**
- * gras_cfg_get_string:
+/** @brief Retrieve a string value of a variable (get a warning if not uniq)
*
- * @th: the config set
- * @name: the name of the cell
- * @val: the wanted value
+ * \arg th the config set
+ * \arg name the name of the variable
+ * \arg val the wanted value
*
* 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 gras_cfg_get_dynar()
- * instead.
+ * If there is more than one value, it will issue a warning. Consider using
+ * xbt_cfg_get_dynar() instead. Returns NULL if there is no value.
*
- * @warning the returned value is the actual content of the config set
+ * \warning the returned value is the actual content of the config set
*/
-gras_error_t gras_cfg_get_string(gras_cfg_t *cfg,
- const char *name,
- char **val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
-
- *val=NULL;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_string,&cell));
+char *xbt_cfg_get_string(xbt_cfg_t cfg, const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
- if (gras_dynar_length(cell->content) > 1) {
- WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
- name, gras_dynar_length(cell->content));
+ if (xbt_dynar_length(variable->content) > 1) {
+ 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;
}
- gras_dynar_get(cell->content, 0, (void*)val);
- return no_error;
+ return xbt_dynar_get_as(variable->content, 0, char *);
}
-/**
- * gras_cfg_get_host:
+/** @brief Retrieve an peer value of a variable (get a warning if not uniq)
*
- * @cfg: the config set
- * @name: the name of the cell
- * @host: the host
- * @port: the port number
+ * \arg cfg the config set
+ * \arg name the name of the variable
+ * \arg peer the peer
+ * \arg port the port number
*
* 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 gras_cfg_get_dynar()
- * instead.
+ * If there is more than one value, it will issue a warning. Consider using
+ * xbt_cfg_get_dynar() instead.
*
- * @warning the returned value is the actual content of the config set
+ * \warning the returned value is the actual content of the config set
*/
-gras_error_t gras_cfg_get_host (gras_cfg_t *cfg,
- const char *name,
- char **host,
- int *port) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
- gras_host_t *val;
+void xbt_cfg_get_peer(xbt_cfg_t cfg, const char *name, char **peer, int *port)
+{
+ xbt_cfgelm_t variable;
+ xbt_peer_t val;
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_host,&cell));
+ variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
- if (gras_dynar_length(cell->content) > 1) {
- WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
- name, gras_dynar_length(cell->content));
+ if (xbt_dynar_length(variable->content) > 1) {
+ WARN2
+ ("You asked for the first value of the config element '%s', but there is %lu values\n",
+ name, xbt_dynar_length(variable->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
- *host=val->name;
- *port=val->port;
-
- return no_error;
+ val = xbt_dynar_get_as(variable->content, 0, xbt_peer_t);
+ *peer = val->name;
+ *port = val->port;
}
-/**
- * gras_cfg_get_dynar:
- * @cfg: where to search in
- * @name: what to search for
- * @dynar: result
+/** @brief Retrieve the dynar of all the values stored in a variable
*
- * Get the data stored in the config bag.
+ * \arg cfg where to search in
+ * \arg name what to search for
+ * \arg dynar result
*
- * @warning the returned value is the actual content of the config set
+ * Get the data stored in the config set.
+ *
+ * \warning the returned value is the actual content of the config set
*/
-gras_error_t gras_cfg_get_dynar (gras_cfg_t *cfg,
- const char *name,
- gras_dynar_t **dynar) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
-
- TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_host,&cell));
- *dynar = cell->content;
- return no_error;
+xbt_dynar_t xbt_cfg_get_dynar(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) {
+ xbt_ex_free(e);
+ THROW1(not_found_error, 0,
+ "No registered variable %s in this config set", name);
+ }
+ RETHROW;
+ }
+
+ 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);
+}
+
+/** @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 *);
+}
+
+/** @brief Retrieve one of the peer value of a variable */
+void
+xbt_cfg_get_peer_at(xbt_cfg_t cfg, const char *name, int pos,
+ char **peer, int *port)
+{
+
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
+ xbt_peer_t val = xbt_dynar_get_ptr(variable->content, pos);
+
+ *port = val->port;
+ *peer = val->name;
}
+
+#ifdef SIMGRID_TEST
+#include "xbt.h"
+#include "xbt/ex.h"
+
+XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
+
+XBT_TEST_SUITE("config", "Configuration support");
+
+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");
+
+ return set;
+} /* end_of_make_set */
+
+XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
+{
+ xbt_cfg_t set = make_set();
+ xbt_test_add0("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_add0("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_fail1("Got an exception. msg=%s", e.msg);
+ xbt_ex_free(e);
+ }
+ xbt_cfg_free(&set);
+ xbt_cfg_free(&set);
+
+
+
+ xbt_test_add0("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_fail1("Got an exception. msg=%s", e.msg);
+ xbt_ex_free(e);
+ }
+ xbt_cfg_check(set);
+ xbt_cfg_free(&set);
+ xbt_cfg_free(&set);
+
+}
+
+XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
+{
+
+ xbt_test_add0("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");
+ if (ival != 42)
+ xbt_test_fail1("Speed value = %d, I expected 42", ival);
+ xbt_cfg_free(&myset);
+ }
+
+ xbt_test_add0("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_fail1("Dynar length = %lu, I expected 3",
+ xbt_dynar_length(dyn));
+
+ if (strcmp(xbt_dynar_get_as(dyn, 0, char *), "foo"))
+ xbt_test_fail1("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_fail1("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_fail1("Dynar[2] = %s, I expected toto",
+ xbt_dynar_get_as(dyn, 2, char *));
+ xbt_cfg_free(&myset);
+ }
+
+ xbt_test_add0("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) {
+ if (e.category != not_found_error)
+ xbt_test_exception(e);
+ xbt_ex_free(e);
+ }
+ xbt_cfg_free(&myset);
+ }
+}
+#endif /* SIMGRID_TEST */
