/* 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. */
+#include <stdio.h>
#include "xbt/misc.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/error.h"
+#include "xbt/ex.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
+#include "xbt/peer.h"
#include "xbt/config.h" /* prototypes of this module */
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(config,xbt,"configuration support");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg,xbt,"configuration support");
/* xbt_cfgelm_t: the typedef corresponding to a config variable.
xbt_cfg_cb_t cb_rm;
/* actual content
- (cannot be an union because type host uses both str and i) */
+ (cannot be an union because type peer uses both str and i) */
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","host","any"};
+ {"int","double","string","peer","any"};
/* Internal stuff used in cache to free a variable */
static void xbt_cfgelm_free(void *data);
/* Retrieve the variable we'll modify */
-static xbt_error_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name,
- e_xbt_cfgelm_type_t type,
- /* OUT */ xbt_cfgelm_t *whereto);
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name,
+ e_xbt_cfgelm_type_t type);
static void xbt_cfg_str_free(void *d){
free(*(void**)d);
}
-static void xbt_cfg_host_free(void *d){
- xbt_host_t *h=(xbt_host_t*) *(void**)d;
- if (h) {
- if (h->name) free(h->name);
- free(h);
- }
-}
/*----[ Memory management ]-----------------------------------------------*/
int ival;
char *sval;
double dval;
- xbt_host_t *hval;
+ xbt_peer_t hval;
if (name)
printf("%s>> Dumping of the config set '%s':\n",indent,name);
}
break;
- case xbt_cfgelm_host:
+ case xbt_cfgelm_peer:
for (i=0; i<size; i++) {
- hval = xbt_dynar_get_as(variable->content,i,xbt_host_t*);
+ hval = xbt_dynar_get_as(variable->content,i,xbt_peer_t);
printf ("%s %s:%d\n",indent,hval->name,hval->port);
}
break;
void
xbt_cfg_register(xbt_cfg_t cfg,
- const char *name, e_xbt_cfgelm_type_t type,
- int min, int max,
- xbt_cfg_cb_t cb_set, xbt_cfg_cb_t cb_rm){
+ const char *name, e_xbt_cfgelm_type_t type,
+ int min, int max,
+ xbt_cfg_cb_t cb_set, xbt_cfg_cb_t cb_rm){
xbt_cfgelm_t res;
- xbt_error_t errcode;
+ xbt_ex_t e;
+ int found=0;
- xbt_assert4(type>=xbt_cfgelm_int && type<=xbt_cfgelm_host,
+ xbt_assert(cfg);
+ 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_host);
- DEBUG5("Register cfg elm %s (%d to %d %s (=%d))",name,min,max,xbt_cfgelm_type_name[type],type);
- errcode = xbt_dict_get((xbt_dict_t)cfg,name,(void**)&res);
+ name,type,xbt_cfgelm_int, xbt_cfgelm_peer);
+ DEBUG5("Register cfg elm %s (%d to %d %s (=%d))",
+ name,min,max,xbt_cfgelm_type_name[type],type);
+ TRY {
+ res = xbt_dict_get((xbt_dict_t)cfg,name);
+ } CATCH(e) {
+ if (e.category == not_found_error) {
+ found = 1;
+ xbt_ex_free(e);
+ } else {
+ RETHROW;
+ }
+ }
- if (errcode == no_error) {
+ if (!found) {
WARN1("Config elem %s registered twice.",name);
/* Will be removed by the insertion of the new one */
}
- xbt_assert_error(mismatch_error);
res=xbt_new(s_xbt_cfgelm_t,1);
res->content = xbt_dynar_new(sizeof(char*),&xbt_cfg_str_free);
break;
- case xbt_cfgelm_host:
- res->content = xbt_dynar_new(sizeof(xbt_host_t*),&xbt_cfg_host_free);
+ case xbt_cfgelm_peer:
+ res->content = xbt_dynar_new(sizeof(xbt_peer_t),&xbt_peer_free_voidp);
break;
default:
* @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.
*/
-xbt_error_t
+void
xbt_cfg_unregister(xbt_cfg_t cfg,const char *name) {
- return xbt_dict_remove((xbt_dict_t)cfg,name);
+ xbt_dict_remove((xbt_dict_t)cfg,name);
}
/**
*
* 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', 'host' or 'double'.
+ * with type being one of 'string','int', 'peer' or 'double'.
*/
-xbt_error_t
+void
xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
char *entrycpy=xbt_strdup(entry);
char *tok;
e_xbt_cfgelm_type_t type;
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);
- xbt_abort();
- }
+ 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);
- xbt_abort();
- }
+ 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);
- xbt_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);
- xbt_abort();
- }
+ 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);
- xbt_abort();
- }
+ xbt_assert2( *(tok++) =='_',
+ "Invalid config element descriptor: %s%s",entry,
+ "; Should be <name>:<min nb>_to_<max nb>_<type>");
for (type=0;
type<xbt_cfgelm_type_count && strcmp(tok,xbt_cfgelm_type_name[type]);
type++);
- if (type == xbt_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);
- xbt_abort();
- }
+ 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'.");
xbt_cfg_register(cfg,entrycpy,type,min,max,NULL,NULL);
free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
- return no_error;
}
/** @brief Check that each variable have the right amount of values */
-xbt_error_t
+void
xbt_cfg_check(xbt_cfg_t cfg) {
xbt_dict_cursor_t cursor;
xbt_cfgelm_t variable;
xbt_dict_foreach((xbt_dict_t)cfg,cursor,name,variable) {
size = xbt_dynar_length(variable->content);
if (variable->min > size) {
- ERROR4("Config elem %s needs at least %d %s, but there is only %d values.",
+ 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);
- xbt_dict_cursor_free(&cursor);
- return mismatch_error;
}
if (variable->max > 0 && variable->max < size) {
- ERROR4("Config elem %s accepts at most %d %s, but there is %d values.",
+ 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);
- xbt_dict_cursor_free(&cursor);
- return mismatch_error;
}
-
}
xbt_dict_cursor_free(&cursor);
- return no_error;
}
-static xbt_error_t xbt_cfgelm_get(xbt_cfg_t cfg,
- const char *name,
- e_xbt_cfgelm_type_t type,
- /* OUT */ xbt_cfgelm_t *whereto){
-
- xbt_error_t errcode = xbt_dict_get((xbt_dict_t)cfg,name,
- (void**)whereto);
-
- if (errcode == mismatch_error) {
- RAISE1(mismatch_error,
- "No registered variable '%s' in this config set",
- name);
+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;
+ xbt_ex_t e;
+
+ TRY {
+ res = 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;
}
- if (errcode != no_error)
- return errcode;
- xbt_assert3(type == xbt_cfgelm_any || (*whereto)->type == 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[(*whereto)->type]);
+ xbt_cfgelm_type_name[res->type]);
- return no_error;
+ return res;
}
/** @brief Get the type of this variable in that configuration set
*
*/
-xbt_error_t
-xbt_cfg_get_type(xbt_cfg_t cfg, const char *name,
- /* OUT */e_xbt_cfgelm_type_t *type) {
+e_xbt_cfgelm_type_t
+xbt_cfg_get_type(xbt_cfg_t cfg, const char *name) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
+ xbt_cfgelm_t variable = NULL;
+ xbt_ex_t e;
- errcode=xbt_dict_get((xbt_dict_t)cfg,name,(void**)&variable);
-
- if (errcode == mismatch_error) {
- RAISE1(mismatch_error,"Can't get the type of '%s' since this variable does not exist",
- name);
- } else if (errcode != no_error) {
- return errcode;
+ 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,
+ "Can't get the type of '%s' since this variable does not exist",name);
+ }
+ RETHROW;
}
INFO1("type in variable = %d",variable->type);
- *type=variable->type;
- return no_error;
+ return variable->type;
}
/*----[ Setting ]---------------------------------------------------------*/
*
* Add some values to the config set.
*/
-xbt_error_t
+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;
+ e_xbt_cfgelm_type_t type=0; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
- xbt_error_t errcode;
+ xbt_ex_t e;
- errcode = xbt_cfg_get_type(cfg,name,&type);
- if (errcode != no_error) {
- 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 xbt_cfgelm_host:
+ case xbt_cfgelm_peer:
str = va_arg(pa, char *);
i=va_arg(pa,int);
- TRY(xbt_cfg_set_host(cfg,name,str,i));
+ xbt_cfg_set_peer(cfg,name,str,i);
break;
case xbt_cfgelm_string:
str=va_arg(pa, char *);
- TRY(xbt_cfg_set_string(cfg, name, str));
+ xbt_cfg_set_string(cfg, name, str);
break;
case xbt_cfgelm_int:
i=va_arg(pa,int);
- TRY(xbt_cfg_set_int(cfg,name,i));
+ xbt_cfg_set_int(cfg,name,i);
break;
case xbt_cfgelm_double:
d=va_arg(pa,double);
- TRY(xbt_cfg_set_double(cfg,name,d));
+ 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;
}
/** @brief Add a NULL-terminated list of pairs {(char*)key, value} to the set
* \arg varargs variable value
*
*/
-xbt_error_t xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...) {
+void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...) {
va_list pa;
- xbt_error_t errcode;
va_start(pa,name);
- errcode=xbt_cfg_set_vargs(cfg,name,pa);
+ xbt_cfg_set_vargs(cfg,name,pa);
va_end(pa);
- return errcode;
}
/** @brief Add values parsed from a string into a config set
* @todo This is a crude manual parser, it should be a proper lexer.
*/
-xbt_error_t
+void
xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
+ xbt_ex_t e;
+
int i;
double d;
char *str;
- xbt_cfgelm_t variable;
+ xbt_cfgelm_t variable=NULL;
char *optionlist_cpy;
char *option, *name,*val;
int len;
- xbt_error_t errcode;
XBT_IN;
if (!options || !strlen(options)) { /* nothing to do */
- return no_error;
+ return;
}
optionlist_cpy=xbt_strdup(options);
option=NULL; /* don't do next iteration */
} else {
- DEBUG3("Boundary on '%c'. len=%d;option-name=%d",
- *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';
if (!val) {
free(optionlist_cpy);
xbt_assert1(FALSE,
- "Malformated option: '%s'; Should be of the form 'name:value'",
+ "Option '%s' badly formated. Should be of the form 'name:value'",
name);
}
*(val++)='\0';
DEBUG2("name='%s';val='%s'",name,val);
- errcode=xbt_dict_get((xbt_dict_t)cfg,name,(void**)&variable);
- switch (errcode) {
- case no_error:
- break;
- case mismatch_error:
- ERROR1("No registrated variable corresponding to '%s'.",name);
- free(optionlist_cpy);
- return mismatch_error;
- break;
- default:
+ TRY {
+ variable = xbt_dict_get((xbt_dict_t)cfg,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);
- return errcode;
- }
-
- switch (variable->type) {
- case xbt_cfgelm_string:
- errcode = xbt_cfg_set_string(cfg, name, val);
- if (errcode != no_error) {
- free(optionlist_cpy);
- return errcode;
- }
- 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);
- }
-
- errcode = xbt_cfg_set_int(cfg,name,i);
- if (errcode != no_error) {
- free(optionlist_cpy);
- return errcode;
- }
- 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);
- }
-
- errcode = xbt_cfg_set_double(cfg,name,d);
- if (errcode != no_error) {
- free(optionlist_cpy);
- return errcode;
- }
- break;
-
- case xbt_cfgelm_host:
- str=val;
- val=strchr(val,':');
- if (!val) {
- free(optionlist_cpy);
- xbt_assert1(FALSE,
- "Value of option %s not valid. Should be an host (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 host (machine:port)",
- name);
+ if (e.category == not_found_error) {
+ xbt_ex_free(e);
+ THROW1(not_found_error,0,"No registrated variable corresponding to '%s'.",name);
}
+ RETHROW;
+ }
- errcode = xbt_cfg_set_host(cfg,name,str,i);
- if (errcode != no_error) {
- free(optionlist_cpy);
- return errcode;
+ 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);
}
- 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;
+
}
/** @brief Set or add an integer value to \a name within \a cfg
* \arg name the name of the variable
* \arg val the value of the variable
*/
-xbt_error_t
+void
xbt_cfg_set_int(xbt_cfg_t cfg,const char*name, int val) {
xbt_cfgelm_t variable;
- xbt_error_t errcode;
VERB2("Configuration setting: %s=%d",name,val);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
if (variable->max == 1) {
if (variable->cb_rm && xbt_dynar_length(variable->content))
xbt_dynar_set(variable->content,0,&val);
} else {
- if (variable->max && xbt_dynar_length(variable->content) == variable->max)
- RAISE3(mismatch_error,
+ 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);
if (variable->cb_set)
(*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
- return no_error;
}
/** @brief Set or add a double value to \a name within \a cfg
* \arg val the doule to set
*/
-xbt_error_t
+void
xbt_cfg_set_double(xbt_cfg_t cfg,const char*name, double val) {
xbt_cfgelm_t variable;
- xbt_error_t errcode;
VERB2("Configuration setting: %s=%f",name,val);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
if (variable->max == 1) {
if (variable->cb_rm && xbt_dynar_length(variable->content))
xbt_dynar_set(variable->content,0,&val);
} else {
if (variable->max && xbt_dynar_length(variable->content) == variable->max)
- RAISE3(mismatch_error,
+ THROW3(mismatch_error,0,
"Cannot add value %f to the config element %s since it's already full (size=%d)",
val,name,variable->max);
if (variable->cb_set)
(*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
- return no_error;
}
/** @brief Set or add a string value to \a name within \a cfg
*
*/
-xbt_error_t
+void
xbt_cfg_set_string(xbt_cfg_t cfg,const char*name, const char*val) {
xbt_cfgelm_t variable;
- xbt_error_t errcode;
char *newval = xbt_strdup(val);
VERB2("Configuration setting: %s=%s",name,val);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
if (variable->max == 1) {
- if (variable->cb_rm && xbt_dynar_length(variable->content))
- (*variable->cb_rm)(name, 0);
+ 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);
+ }
+ }
xbt_dynar_set(variable->content,0,&newval);
} else {
if (variable->max && xbt_dynar_length(variable->content) == variable->max)
- RAISE3(mismatch_error,
+ THROW3(mismatch_error,0,
"Cannot add value %s to the config element %s since it's already full (size=%d)",
name,val,variable->max);
if (variable->cb_set)
(*variable->cb_set)(name, xbt_dynar_length(variable->content) -1);
- return no_error;
}
-/** @brief Set or add an host value to \a name within \a cfg
+/** @brief Set or add an peer value to \a name within \a cfg
*
* \arg cfg the config set
* \arg name the name of the variable
- * \arg host the host
+ * \arg peer the peer
* \arg port the port number
*
- * \e host values are composed of a string (hostname) and an integer (port)
+ * \e peer values are composed of a string (peername) and an integer (port)
*/
-xbt_error_t
-xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
- const char *host,int port) {
+void
+xbt_cfg_set_peer(xbt_cfg_t cfg,const char*name,
+ const char *peer,int port) {
xbt_cfgelm_t variable;
- xbt_error_t errcode;
- xbt_host_t *val=xbt_new(xbt_host_t,1);
+ xbt_peer_t val=xbt_peer_new(peer,port);
- VERB3("Configuration setting: %s=%s:%d",name,host,port);
+ VERB3("Configuration setting: %s=%s:%d",name,peer,port);
- val->name = xbt_strdup(name);
- val->port = port;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_host,&variable));
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_peer);
if (variable->max == 1) {
if (variable->cb_rm && xbt_dynar_length(variable->content))
xbt_dynar_set(variable->content,0,&val);
} else {
if (variable->max && xbt_dynar_length(variable->content) == variable->max)
- RAISE4(mismatch_error,
+ THROW4(mismatch_error,0,
"Cannot add value %s:%d to the config element %s since it's already full (size=%d)",
- host,port,name,variable->max);
+ 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);
- return no_error;
}
/* ---- [ Removing ] ---- */
* \arg name the name of the variable
* \arg val the value to be removed
*/
-xbt_error_t xbt_cfg_rm_int(xbt_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;
int cpt,seen;
- xbt_error_t errcode;
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
+
if (xbt_dynar_length(variable->content) == variable->min)
- RAISE3(mismatch_error,
+ 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);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
-
xbt_dynar_foreach(variable->content,cpt,seen) {
if (seen == val) {
if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
xbt_dynar_cursor_rm(variable->content,&cpt);
- return no_error;
+ 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);
}
/** @brief Remove the provided \e val double value from a variable
* \arg val the value to be removed
*/
-xbt_error_t xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
+void xbt_cfg_rm_double(xbt_cfg_t cfg,const char*name, double val) {
xbt_cfgelm_t variable;
int cpt;
double seen;
- xbt_error_t errcode;
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
+
if (xbt_dynar_length(variable->content) == variable->min)
- RAISE3(mismatch_error,
+ 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);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
-
xbt_dynar_foreach(variable->content,cpt,seen) {
if (seen == val) {
xbt_dynar_cursor_rm(variable->content,&cpt);
- if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
- return no_error;
+ 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);
}
/** @brief Remove the provided \e val string value from a variable
* \arg name the name of the variable
* \arg val the value of the string which will be removed
*/
-xbt_error_t
+void
xbt_cfg_rm_string(xbt_cfg_t cfg,const char*name, const char *val) {
xbt_cfgelm_t variable;
int cpt;
char *seen;
- xbt_error_t errcode;
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_string);
+
if (xbt_dynar_length(variable->content) == variable->min)
- RAISE3(mismatch_error,
+ 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);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
-
xbt_dynar_foreach(variable->content,cpt,seen) {
if (!strcpy(seen,val)) {
- if (variable->cb_rm) (*variable->cb_rm)(name, cpt);
+ if (variable->cb_rm)
+ (*variable->cb_rm)(name, cpt);
xbt_dynar_cursor_rm(variable->content,&cpt);
- return no_error;
+ 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);
}
-/** @brief Remove the provided \e val host value from a variable
+/** @brief Remove the provided \e val peer value from a variable
*
* \arg cfg the config set
* \arg name the name of the variable
- * \arg host the hostname
+ * \arg peer the peername
* \arg port the port number
*/
-xbt_error_t
-xbt_cfg_rm_host(xbt_cfg_t cfg,const char*name, const char *host,int port) {
+void
+xbt_cfg_rm_peer(xbt_cfg_t cfg,const char*name, const char *peer,int port) {
xbt_cfgelm_t variable;
int cpt;
- xbt_host_t *seen;
- xbt_error_t errcode;
+ xbt_peer_t seen;
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_peer);
+
if (xbt_dynar_length(variable->content) == variable->min)
- RAISE4(mismatch_error,
+ THROW4(mismatch_error,0,
"Cannot remove value %s:%d from the config element %s since it's already at its minimal size (=%d)",
- host,port,name,variable->min);
+ peer,port,name,variable->min);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_host,&variable));
-
xbt_dynar_foreach(variable->content,cpt,seen) {
- if (!strcpy(seen->name,host) && seen->port == port) {
+ 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 no_error;
+ 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);
}
/** @brief Remove the \e pos th value from the provided variable */
-xbt_error_t xbt_cfg_rm_at (xbt_cfg_t cfg, const char *name, int pos) {
+void xbt_cfg_rm_at (xbt_cfg_t cfg, const char *name, int pos) {
xbt_cfgelm_t variable;
- int cpt;
- xbt_host_t *seen;
- xbt_error_t errcode;
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_any);
+
if (xbt_dynar_length(variable->content) == variable->min)
- RAISE3(mismatch_error,
+ 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);
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_any,&variable));
if (variable->cb_rm) (*variable->cb_rm)(name, pos);
xbt_dynar_remove_at(variable->content, pos, NULL);
-
- return mismatch_error;
}
/** @brief Remove all the values from a variable
* \arg name the name of the variable
*/
-xbt_error_t
+void
xbt_cfg_empty(xbt_cfg_t cfg,const char*name) {
- xbt_cfgelm_t variable;
+ xbt_cfgelm_t variable=NULL;
+ xbt_ex_t e;
- xbt_error_t errcode;
+ TRY {
+ variable = xbt_dict_get((xbt_dict_t)cfg,name);
+ } CATCH(e) {
+ if (e.category != not_found_error)
+ RETHROW;
- TRYCATCH(mismatch_error,
- xbt_dict_get((xbt_dict_t)cfg,name,(void**)&variable));
- if (errcode == mismatch_error) {
- ERROR1("Can't empty '%s' since this config element does not exist",
- name);
- return mismatch_error;
+ xbt_ex_free(e);
+ THROW1(not_found_error,0,
+ "Can't empty '%s' since this config element does not exist", name);
}
if (variable) {
}
xbt_dynar_reset(variable->content);
}
- return no_error;
}
/*----[ Getting ]---------------------------------------------------------*/
*
* \warning the returned value is the actual content of the config set
*/
-xbt_error_t
-xbt_cfg_get_int (xbt_cfg_t cfg,
- const char *name,
- int *val) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
+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));
+ name, xbt_dynar_length(variable->content));
}
- *val = xbt_dynar_get_as(variable->content, 0, int);
- return no_error;
+ return xbt_dynar_get_as(variable->content, 0, int);
}
/** @brief Retrieve a double value of a variable (get a warning if not uniq)
* \warning the returned value is the actual content of the config set
*/
-xbt_error_t
-xbt_cfg_get_double(xbt_cfg_t cfg,
- const char *name,
- double *val) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
+double
+xbt_cfg_get_double(xbt_cfg_t cfg, const char *name) {
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_double);
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));
}
- *val = xbt_dynar_get_as(variable->content, 0, double);
- return no_error;
+ return xbt_dynar_get_as(variable->content, 0, double);
}
/** @brief Retrieve a string value of a variable (get a warning if not uniq)
* \warning the returned value is the actual content of the config set
*/
-xbt_error_t xbt_cfg_get_string(xbt_cfg_t cfg,
- const char *name,
- char **val) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
-
- *val=NULL;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
+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 (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));
+ name, xbt_dynar_length(variable->content));
}
- *val = xbt_dynar_get_as(variable->content, 0, char *);
- return no_error;
+ return xbt_dynar_get_as(variable->content, 0, char *);
}
-/** @brief Retrieve an host value of a variable (get a warning if not uniq)
+/** @brief Retrieve an peer value of a variable (get a warning if not uniq)
*
* \arg cfg the config set
* \arg name the name of the variable
- * \arg host the host
+ * \arg peer the peer
* \arg port the port number
*
* Returns the first value from the config set under the given name.
* \warning the returned value is the actual content of the config set
*/
-xbt_error_t xbt_cfg_get_host (xbt_cfg_t cfg,
- const char *name,
- char **host,
- int *port) {
+void xbt_cfg_get_peer (xbt_cfg_t cfg, const char *name,
+ char **peer, int *port) {
xbt_cfgelm_t variable;
- xbt_error_t errcode;
- xbt_host_t *val;
+ xbt_peer_t val;
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_host,&variable));
+ variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_peer);
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));
}
- val = xbt_dynar_get_as(variable->content, 0, xbt_host_t*);
- *host=val->name;
+ val = xbt_dynar_get_as(variable->content, 0, xbt_peer_t);
+ *peer=val->name;
*port=val->port;
-
- return no_error;
}
/** @brief Retrieve the dynar of all the values stored in a variable
*
* \warning the returned value is the actual content of the config set
*/
-xbt_error_t xbt_cfg_get_dynar (xbt_cfg_t cfg,
- const char *name,
- xbt_dynar_t *dynar) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode = xbt_dict_get((xbt_dict_t)cfg,name,
- (void**)&variable);
-
- if (errcode == mismatch_error) {
- ERROR1("No registered variable %s in this config set",
- name);
- return mismatch_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;
}
- if (errcode != no_error)
- return errcode;
- *dynar = variable->content;
- return no_error;
+ return variable->content;
}
/** @brief Retrieve one of the integer value of a variable */
-xbt_error_t
-xbt_cfg_get_int_at(xbt_cfg_t cfg,
- const char *name,
- int pos,
- int *val) {
+int
+xbt_cfg_get_int_at(xbt_cfg_t cfg, const char *name, int pos) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
- *val = xbt_dynar_get_as(variable->content, pos, int);
- return no_error;
+ 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 */
-xbt_error_t
-xbt_cfg_get_double_at(xbt_cfg_t cfg,
- const char *name,
- int pos,
- double *val) {
+double
+xbt_cfg_get_double_at(xbt_cfg_t cfg, const char *name, int pos) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_double,&variable));
- *val = xbt_dynar_get_as(variable->content, pos, double);
- return no_error;
+ 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 */
-xbt_error_t
-xbt_cfg_get_string_at(xbt_cfg_t cfg,
- const char *name,
- int pos,
- char **val) {
+char*
+xbt_cfg_get_string_at(xbt_cfg_t cfg, const char *name, int pos) {
- xbt_cfgelm_t variable;
- xbt_error_t errcode;
-
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_string,&variable));
- *val = xbt_dynar_get_as(variable->content, pos, char*);
- return no_error;
+ 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 host value of a variable */
-xbt_error_t
-xbt_cfg_get_host_at(xbt_cfg_t cfg,
- const char *name,
- int pos,
- char **host,
- int *port) {
+/** @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_error_t errcode;
- xbt_host_t *val;
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
+ xbt_peer_t val = xbt_dynar_get_ptr(variable->content, pos);
- TRY (xbt_cfgelm_get(cfg,name,xbt_cfgelm_int,&variable));
- val = xbt_dynar_get_ptr(variable->content, pos);
*port = val->port;
- *host = val->name;
- return no_error;
+ *peer = val->name;
+}
+
+
+#ifdef SIMGRID_TEST
+#include "xbt.h"
+#include "xbt/ex.h"
+
+XBT_TEST_SUITE("config","Configuration support");
+
+static xbt_cfg_t make_set(){
+ xbt_cfg_t set=NULL;
+
+ 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");
+
+ 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 = %d, I expected 3", (int)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 */