/* 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 "gras_private.h" /* prototypes of this module */
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/error.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(config,gros,"configuration support");
+#include "xbt/config.h" /* prototypes of this module */
+
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(config,xbt,"configuration support");
/* gras_cfgelm_t: the typedef corresponding to a config cell.
typedef struct {
/* Allowed type of the cell */
- gras_cfgelm_type_t type;
+ e_gras_cfgelm_type_t type;
int min,max;
/* actual content
(cannot be an union because type host uses both str and i) */
- gras_dynar_t *content;
-} gras_cfgelm_t;
+ gras_dynar_t content;
+} s_gras_cfgelm_t,*gras_cfgelm_t;
static const char *gras_cfgelm_type_name[gras_cfgelm_type_count]=
{"int","double","string","host"};
static void gras_cfgelm_free(void *data);
/* 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 gras_error_t gras_cfgelm_get(gras_cfg_t cfg, const char *name,
+ e_gras_cfgelm_type_t type,
+ /* OUT */ gras_cfgelm_t *whereto);
void gras_cfg_str_free(void *d);
void gras_cfg_host_free(void *d);
*/
-gras_error_t gras_cfg_new(gras_cfg_t **whereto) {
- return gras_dict_new((gras_dict_t**)whereto);
+gras_cfg_t gras_cfg_new(void) {
+ return (gras_cfg_t)gras_dict_new();
}
/**
*
*/
-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;
+void
+gras_cfg_cpy(gras_cfg_t tocopy,gras_cfg_t *whereto) {
+ 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;
- }
+ gras_dict_foreach((gras_dict_t)tocopy,cursor,name,cell) {
+ gras_cfg_register(*whereto, name, cell->type, cell->min, cell->max);
}
-
- return errcode;
}
-void gras_cfg_free(gras_cfg_t **cfg) {
- gras_dict_free((gras_dict_t**)cfg);
+void gras_cfg_free(gras_cfg_t *cfg) {
+ gras_dict_free((gras_dict_t*)cfg);
}
/**
* Dumps a config set for debuging purpose
*/
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;
+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;
int ival;
char *sval;
double dval;
- gras_host_t hval;
+ gras_host_t *hval;
if (name)
printf("%s>> Dumping of the config set '%s':\n",indent,name);
case gras_cfgelm_int:
for (i=0; i<size; i++) {
- gras_dynar_get(cell->content,i,&ival);
+ ival = gras_dynar_get_as(cell->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);
+ dval = gras_dynar_get_as(cell->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);
+ sval = gras_dynar_get_as(cell->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);
+ hval = gras_dynar_get_as(cell->content,i,gras_host_t*);
+ printf ("%s %s:%d\n",indent,hval->name,hval->port);
}
break;
if (name) printf("%s<< End of the config set '%s'\n",indent,name);
fflush(stdout);
- gras_dict_cursor_free(cursor);
+ gras_dict_cursor_free(&cursor);
return;
}
*/
void gras_cfgelm_free(void *data) {
- gras_cfgelm_t *c=(gras_cfgelm_t *)data;
+ gras_cfgelm_t c=(gras_cfgelm_t)data;
if (!c) return;
- gras_dynar_free(c->content);
+ gras_dynar_free(&(c->content));
gras_free(c);
}
* register an element within a config set
*/
-gras_error_t
-gras_cfg_register(gras_cfg_t *cfg,
- const char *name, gras_cfgelm_type_t type,
+void
+gras_cfg_register(gras_cfg_t cfg,
+ const char *name, e_gras_cfgelm_type_t type,
int min, int max){
- gras_cfgelm_t *res;
+ gras_cfgelm_t res;
gras_error_t errcode;
DEBUG4("Register cfg elm %s (%d to %d %s)",name,min,max,gras_cfgelm_type_name[type]);
- TRYCATCH(mismatch_error,gras_dict_get((gras_dict_t*)cfg,name,(void**)&res));
+ errcode = gras_dict_get((gras_dict_t)cfg,name,(void**)&res);
- if (errcode != mismatch_error) {
+ if (errcode == no_error) {
WARN1("Config elem %s registered twice.",name);
/* Will be removed by the insertion of the new one */
}
+ gras_assert_error(mismatch_error);
- res=gras_new(gras_cfgelm_t,1);
- if (!res)
- RAISE_MALLOC;
+ res=gras_new(s_gras_cfgelm_t,1);
res->type=type;
res->min=min;
switch (type) {
case gras_cfgelm_int:
- TRY(gras_dynar_new(&(res->content), sizeof(int), NULL));
+ res->content = gras_dynar_new(sizeof(int), NULL);
break;
case gras_cfgelm_double:
- TRY(gras_dynar_new(&(res->content), sizeof(double), NULL));
+ res->content = gras_dynar_new(sizeof(double), NULL);
break;
case gras_cfgelm_string:
- TRY(gras_dynar_new(&(res->content),sizeof(char*),&gras_cfg_str_free));
+ res->content = gras_dynar_new(sizeof(char*),&gras_cfg_str_free);
break;
case gras_cfgelm_host:
- TRY(gras_dynar_new(&(res->content),sizeof(gras_host_t*),&gras_cfg_host_free));
+ res->content = gras_dynar_new(sizeof(gras_host_t*),&gras_cfg_host_free);
break;
default:
ERROR1("%d is an invalide type code",type);
}
- return gras_dict_set((gras_dict_t*)cfg,name,res,&gras_cfgelm_free);
+ gras_dict_set((gras_dict_t)cfg,name,res,&gras_cfgelm_free);
}
/**
*/
gras_error_t
-gras_cfg_unregister(gras_cfg_t *cfg,const char *name) {
- return gras_dict_remove((gras_dict_t*)cfg,name);
+gras_cfg_unregister(gras_cfg_t cfg,const char *name) {
+ return gras_dict_remove((gras_dict_t)cfg,name);
}
/**
*/
gras_error_t
-gras_cfg_register_str(gras_cfg_t *cfg,const char *entry) {
- char *entrycpy=strdup(entry);
+gras_cfg_register_str(gras_cfg_t cfg,const char *entry) {
+ char *entrycpy=gras_strdup(entry);
char *tok;
int min,max;
- gras_cfgelm_type_t type;
-
- gras_error_t errcode;
+ e_gras_cfgelm_type_t type;
tok=strchr(entrycpy, ':');
if (!tok) {
gras_abort();
}
- TRYCLEAN(gras_cfg_register(cfg,entrycpy,type,min,max),
- gras_free(entrycpy));
+ gras_cfg_register(cfg,entrycpy,type,min,max);
gras_free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
return no_error;
*/
gras_error_t
-gras_cfg_check(gras_cfg_t *cfg) {
- gras_dict_cursor_t *cursor;
- gras_cfgelm_t *cell;
+gras_cfg_check(gras_cfg_t cfg) {
+ gras_dict_cursor_t cursor;
+ gras_cfgelm_t cell;
char *name;
int size;
gras_assert0(cfg,"NULL config set.");
- gras_dict_foreach((gras_dict_t*)cfg,cursor,name,cell) {
+ 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.",
cell->min,
gras_cfgelm_type_name[cell->type],
size);
- gras_dict_cursor_free(cursor);
+ gras_dict_cursor_free(&cursor);
return mismatch_error;
}
cell->max,
gras_cfgelm_type_name[cell->type],
size);
- gras_dict_cursor_free(cursor);
+ gras_dict_cursor_free(&cursor);
return mismatch_error;
}
}
- gras_dict_cursor_free(cursor);
+ gras_dict_cursor_free(&cursor);
return no_error;
}
-static gras_error_t gras_cfgelm_get(gras_cfg_t *cfg,
+static gras_error_t gras_cfgelm_get(gras_cfg_t cfg,
const char *name,
- gras_cfgelm_type_t type,
- /* OUT */ gras_cfgelm_t **whereto){
+ e_gras_cfgelm_type_t type,
+ /* OUT */ gras_cfgelm_t *whereto){
- gras_error_t errcode = gras_dict_get((gras_dict_t*)cfg,name,
+ gras_error_t errcode = gras_dict_get((gras_dict_t)cfg,name,
(void**)whereto);
if (errcode == mismatch_error) {
*/
gras_error_t
-gras_cfg_get_type(gras_cfg_t *cfg, const char *name,
- /* OUT */gras_cfgelm_type_t *type) {
+gras_cfg_get_type(gras_cfg_t cfg, const char *name,
+ /* OUT */e_gras_cfgelm_type_t *type) {
- gras_cfgelm_t *cell;
+ gras_cfgelm_t cell;
gras_error_t errcode;
- TRYCATCH(mismatch_error,gras_dict_get((gras_dict_t*)cfg,name,(void**)&cell));
+ 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",
* @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) {
+gras_cfg_set_vargs(gras_cfg_t cfg, va_list pa) {
char *str,*name;
int i;
double d;
- gras_cfgelm_type_t type;
+ e_gras_cfgelm_type_t type;
gras_error_t errcode;
* 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, ...) {
+gras_error_t gras_cfg_set(gras_cfg_t cfg, ...) {
va_list pa;
gras_error_t errcode;
*/
gras_error_t
-gras_cfg_set_parse(gras_cfg_t *cfg, const char *options) {
+gras_cfg_set_parse(gras_cfg_t cfg, const char *options) {
int i;
double d;
char *str;
- gras_cfgelm_t *cell;
+ gras_cfgelm_t cell;
char *optionlist_cpy;
char *option, *name,*val;
if (!options || !strlen(options)) { /* nothing to do */
return no_error;
}
- optionlist_cpy=strdup(options);
+ optionlist_cpy=gras_strdup(options);
DEBUG1("List to parse and set:'%s'",options);
option=optionlist_cpy;
/* Pass the value */
while (option-name<=(len-1) && *option != ' ' && *option != '\n' && *option != '\t') {
- //fprintf(stderr,"Take %c.\n",*option);
+ /*fprintf(stderr,"Take %c.\n",*option);*/
option++;
}
if (option-name == len) {
- //fprintf(stderr,"Boundary=EOL\n");
+ /*fprintf(stderr,"Boundary=EOL\n");*/
option=NULL; /* don't do next iteration */
} else {
- //fprintf(stderr,"Boundary on '%c'. len=%d;option-name=%d\n",*option,len,option-name);
+ /*fprintf(stderr,"Boundary on '%c'. len=%d;option-name=%d\n",*option,len,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");
+ /* fprintf(stderr,"Ignore a blank char.\n");*/
option++;
}
if (option-name == len-1)
DEBUG2("name='%s';val='%s'",name,val);
- errcode=gras_dict_get((gras_dict_t*)cfg,name,(void**)&cell);
+ errcode=gras_dict_get((gras_dict_t)cfg,name,(void**)&cell);
switch (errcode) {
case no_error:
break;
* 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_cfg_set_int(gras_cfg_t cfg,const char*name, int val) {
+ gras_cfgelm_t cell;
gras_error_t errcode;
VERB2("Configuration setting: %s=%d",name,val);
TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_int,&cell));
if (cell->max > 1) {
- return gras_dynar_push(cell->content,&val);
+ gras_dynar_push(cell->content,&val);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ gras_dynar_set(cell->content,0,&val);
}
+ return no_error;
}
/**
*/
gras_error_t
-gras_cfg_set_double(gras_cfg_t *cfg,const char*name, double val) {
- gras_cfgelm_t *cell;
+gras_cfg_set_double(gras_cfg_t cfg,const char*name, double val) {
+ gras_cfgelm_t cell;
gras_error_t errcode;
VERB2("Configuration setting: %s=%f",name,val);
TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_double,&cell));
if (cell->max > 1) {
- return gras_dynar_push(cell->content,&val);
+ gras_dynar_push(cell->content,&val);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ gras_dynar_set(cell->content,0,&val);
}
+ return no_error;
}
/**
*/
gras_error_t
-gras_cfg_set_string(gras_cfg_t *cfg,const char*name, const char*val) {
- gras_cfgelm_t *cell;
+gras_cfg_set_string(gras_cfg_t cfg,const char*name, const char*val) {
+ gras_cfgelm_t cell;
gras_error_t errcode;
- char *newval = strdup(val);
+ char *newval = gras_strdup(val);
VERB2("Configuration setting: %s=%s",name,val);
TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_string,&cell));
if (cell->max > 1) {
- return gras_dynar_push(cell->content,&newval);
+ gras_dynar_push(cell->content,&newval);
} else {
- return gras_dynar_set(cell->content,0,&newval);
+ gras_dynar_set(cell->content,0,&newval);
}
+ return no_error;
}
/**
*/
gras_error_t
-gras_cfg_set_host(gras_cfg_t *cfg,const char*name,
+gras_cfg_set_host(gras_cfg_t cfg,const char*name,
const char *host,int port) {
- gras_cfgelm_t *cell;
+ gras_cfgelm_t cell;
gras_error_t errcode;
gras_host_t *val=gras_new(gras_host_t,1);
VERB3("Configuration setting: %s=%s:%d",name,host,port);
- if (!val)
- RAISE_MALLOC;
- val->name = strdup(name);
+
+ val->name = gras_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);
+ gras_dynar_push(cell->content,&val);
} else {
- return gras_dynar_set(cell->content,0,&val);
+ gras_dynar_set(cell->content,0,&val);
}
+ return no_error;
}
/* ---- [ Removing ] ---- */
*
* Remove the provided @val from the cell @name in @cfg.
*/
-gras_error_t gras_cfg_rm_int (gras_cfg_t *cfg,const char*name, int val) {
+gras_error_t gras_cfg_rm_int(gras_cfg_t cfg,const char*name, int val) {
- gras_cfgelm_t *cell;
+ gras_cfgelm_t cell;
int cpt,seen;
gras_error_t errcode;
* Remove the provided @val from the cell @name in @cfg.
*/
-gras_error_t gras_cfg_rm_double(gras_cfg_t *cfg,const char*name, double val) {
- gras_cfgelm_t *cell;
+gras_error_t gras_cfg_rm_double(gras_cfg_t cfg,const char*name, double val) {
+ gras_cfgelm_t cell;
int cpt;
double seen;
gras_error_t errcode;
* Remove the provided @val from the cell @name in @cfg.
*/
gras_error_t
-gras_cfg_rm_string(gras_cfg_t *cfg,const char*name, const char *val) {
- gras_cfgelm_t *cell;
+gras_cfg_rm_string(gras_cfg_t cfg,const char*name, const char *val) {
+ gras_cfgelm_t cell;
int cpt;
char *seen;
gras_error_t errcode;
*/
gras_error_t
-gras_cfg_rm_host (gras_cfg_t *cfg,const char*name, const char *host,int port) {
- gras_cfgelm_t *cell;
+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;
*/
gras_error_t
-gras_cfg_empty(gras_cfg_t *cfg,const char*name) {
- gras_cfgelm_t *cell;
+gras_cfg_empty(gras_cfg_t cfg,const char*name) {
+ gras_cfgelm_t cell;
gras_error_t errcode;
TRYCATCH(mismatch_error,
- gras_dict_get((gras_dict_t*)cfg,name,(void**)&cell));
+ 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);
* @warning the returned value is the actual content of the config set
*/
gras_error_t
-gras_cfg_get_int (gras_cfg_t *cfg,
+gras_cfg_get_int (gras_cfg_t cfg,
const char *name,
int *val) {
- gras_cfgelm_t *cell;
+ gras_cfgelm_t cell;
gras_error_t errcode;
TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_int,&cell));
name, gras_dynar_length(cell->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
+ *val = gras_dynar_get_as(cell->content, 0, int);
return no_error;
}
*/
gras_error_t
-gras_cfg_get_double(gras_cfg_t *cfg,
+gras_cfg_get_double(gras_cfg_t cfg,
const char *name,
double *val) {
- gras_cfgelm_t *cell;
- gras_error_t errcode;
+ gras_cfgelm_t cell;
+ gras_error_t errcode;
TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_double,&cell));
name, gras_dynar_length(cell->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
+ *val = gras_dynar_get_as(cell->content, 0, double);
return no_error;
}
* @warning the returned value is the actual content of the config set
*/
-gras_error_t gras_cfg_get_string(gras_cfg_t *cfg,
+gras_error_t gras_cfg_get_string(gras_cfg_t cfg,
const char *name,
char **val) {
- gras_cfgelm_t *cell;
+ gras_cfgelm_t cell;
gras_error_t errcode;
*val=NULL;
name, gras_dynar_length(cell->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
+ *val = gras_dynar_get_as(cell->content, 0, char *);
return no_error;
}
* @warning the returned value is the actual content of the config set
*/
-gras_error_t gras_cfg_get_host (gras_cfg_t *cfg,
+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;
+ gras_cfgelm_t cell;
+ gras_error_t errcode;
+ gras_host_t *val;
TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_host,&cell));
name, gras_dynar_length(cell->content));
}
- gras_dynar_get(cell->content, 0, (void*)val);
+ val = gras_dynar_get_as(cell->content, 0, gras_host_t*);
*host=val->name;
*port=val->port;
*
* @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 = gras_dict_get((gras_dict_t*)cfg,name,
- (void**)&cell);
+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 = gras_dict_get((gras_dict_t)cfg,name,
+ (void**)&cell);
if (errcode == mismatch_error) {
ERROR1("No registered cell %s in this config set",
