xbt_cfgelm_t variable = NULL;
char *name = NULL;
- DEBUG1("Copy cfg set %p", tocopy);
+ XBT_DEBUG("Copy cfg set %p", tocopy);
*whereto = NULL;
xbt_assert0(tocopy, "cannot copy NULL config");
/** @brief Destructor */
void xbt_cfg_free(xbt_cfg_t * cfg)
{
- DEBUG1("Frees cfg set %p", cfg);
+ XBT_DEBUG("Frees cfg set %p", cfg);
xbt_dict_free((xbt_dict_t *) cfg);
}
{
xbt_cfgelm_t c = (xbt_cfgelm_t) data;
- DEBUG1("Frees cfgelm %p", c);
+ XBT_DEBUG("Frees cfgelm %p", c);
if (!c)
return;
xbt_free(c->desc);
res = xbt_dict_get_or_null((xbt_dict_t) * cfg, name);
if (res) {
- WARN1("Config elem %s registered twice.", name);
+ XBT_WARN("Config elem %s registered twice.", name);
/* Will be removed by the insertion of the new one */
}
res = xbt_new(s_xbt_cfgelm_t, 1);
- DEBUG8("Register cfg elm %s (%s) (%d to %d %s (=%d) @%p in set %p)",
+ XBT_DEBUG("Register cfg elm %s (%s) (%d to %d %s (=%d) @%p in set %p)",
name, desc, min, max, xbt_cfgelm_type_name[type], type, res,
*cfg);
break;
default:
- ERROR1("%d is an invalide type code", type);
+ XBT_ERROR("%d is an invalide type code", type);
}
xbt_dict_set((xbt_dict_t) * cfg, name, res, &xbt_cfgelm_free);
void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name)
{
- DEBUG2("Unregister elm '%s' from set %p", name, cfg);
+ XBT_DEBUG("Unregister elm '%s' from set %p", name, cfg);
xbt_dict_remove((xbt_dict_t) cfg, name);
}
int min, max;
e_xbt_cfgelm_type_t type;
- DEBUG1("Register string '%s'", entry);
+ XBT_DEBUG("Register string '%s'", entry);
tok = strchr(entrycpy, ':');
xbt_assert2(tok, "Invalid config element descriptor: %s%s",
free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
}
+static int strcmp_voidp(const void *pa, const void *pb)
+{
+ return strcmp(*(const char **)pa, *(const char **)pb);
+}
+
/** @brief Displays the declared options and their description */
void xbt_cfg_help(xbt_cfg_t cfg)
{
- xbt_dict_cursor_t cursor;
+ xbt_dict_cursor_t dict_cursor;
+ unsigned int dynar_cursor;
xbt_cfgelm_t variable;
char *name;
+ xbt_dynar_t names = xbt_dynar_new(sizeof(char *), NULL);
- int i;
- int size;
+ xbt_dict_foreach((xbt_dict_t )cfg, dict_cursor, name, variable) {
+ xbt_dynar_push(names, &name);
+ }
+ xbt_dynar_sort(names, strcmp_voidp);
+
+ xbt_dynar_foreach(names, dynar_cursor, name) {
+ int i;
+ int size;
+ variable = xbt_dict_get((xbt_dict_t )cfg, name);
- 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) {
}
}
+
+ xbt_dynar_free(&names);
}
/** @brief Check that each variable have the right amount of values */
int size;
xbt_assert0(cfg, "NULL config set.");
- DEBUG1("Check cfg set %p", cfg);
+ XBT_DEBUG("Check cfg set %p", cfg);
xbt_dict_foreach((xbt_dict_t) cfg, cursor, name, variable) {
size = xbt_dynar_length(variable->content);
"Can't get the type of '%s' since this variable does not exist",
name);
- INFO1("type in variable = %d", variable->type);
+ XBT_INFO("type in variable = %d", variable->type);
return variable->type;
}
break;
default:
- xbt_assert2(0, "Config element variable %s not valid (type=%d)", name,
- type);
+ xbt_die("Config element variable %s not valid (type=%d)", name, type);
}
}
int len;
- XBT_IN;
+ XBT_IN("");
if (!options || !strlen(options)) { /* nothing to do */
return;
}
optionlist_cpy = xbt_strdup(options);
- DEBUG1("List to parse and set:'%s'", options);
+ XBT_DEBUG("List to parse and set:'%s'", options);
option = optionlist_cpy;
while (1) { /* breaks in the code */
break;
name = option;
len = strlen(name);
- DEBUG3("Still to parse and set: '%s'. len=%d; option-name=%ld",
+ XBT_DEBUG("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' && *option != ',') {
- DEBUG1("Take %c.", *option);
+ XBT_DEBUG("Take %c.", *option);
option++;
}
if (option - name == len) {
- DEBUG0("Boundary=EOL");
+ XBT_DEBUG("Boundary=EOL");
option = NULL; /* don't do next iteration */
} else {
- DEBUG3("Boundary on '%c'. len=%d;option-name=%ld",
+ XBT_DEBUG("Boundary on '%c'. len=%d;option-name=%ld",
*option, len, (long) (option - name));
/* Pass the following blank chars */
if (option - name == len - 1)
option = NULL; /* don't do next iteration */
}
- DEBUG2("parse now:'%s'; parse later:'%s'", name, option);
+ XBT_DEBUG("parse now:'%s'; parse later:'%s'", name, option);
if (name[0] == ' ' || name[0] == '\n' || name[0] == '\t')
continue;
val = strchr(name, ':');
if (!val) {
free(optionlist_cpy);
- xbt_assert1(FALSE,
- "Option '%s' badly formated. Should be of the form 'name:value'",
- name);
+ xbt_die("Option '%s' badly formated. Should be of the form 'name:value'",
+ name);
}
*(val++) = '\0';
- INFO2("Configuration change: Set '%s' to '%s'", name, val);
+ if (strcmp(name,"contexts/factory"))
+ XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
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_die("Value of option %s not valid. Should be an integer", name);
}
xbt_cfg_set_int(cfg, name, i); /* throws */
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_die("Value of option %s not valid. Should be a double", name);
}
xbt_cfg_set_double(cfg, name, d); /* throws */
val = strchr(val, ':');
if (!val) {
free(optionlist_cpy);
- xbt_assert1(FALSE,
- "Value of option %s not valid. Should be an peer (machine:port)",
- name);
+ xbt_die("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_die("Value of option %s not valid. Should be an peer (machine:port)",
+ name);
}
xbt_cfg_set_peer(cfg, name, str, i); /* throws */
{
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
- if (variable->isdefault)
+ if (variable->isdefault){
xbt_cfg_set_int(cfg, name, val);
- else
- DEBUG2
+ variable->isdefault = 1;
+ }
+ else
+ XBT_DEBUG
("Do not override configuration variable '%s' with value '%d' because it was already set.",
name, val);
}
{
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
- if (variable->isdefault)
+ if (variable->isdefault) {
xbt_cfg_set_double(cfg, name, val);
+ variable->isdefault = 1;
+ }
else
- DEBUG2
+ XBT_DEBUG
("Do not override configuration variable '%s' with value '%lf' because it was already set.",
name, val);
}
{
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
- if (variable->isdefault)
+ if (variable->isdefault){
xbt_cfg_set_string(cfg, name, val);
+ variable->isdefault = 1;
+ }
else
- DEBUG2
+ XBT_DEBUG
("Do not override configuration variable '%s' with value '%s' because it was already set.",
name, val);
}
{
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
- if (variable->isdefault)
+ if (variable->isdefault){
xbt_cfg_set_peer(cfg, name, host, port);
+ variable->isdefault = 1;
+ }
else
- DEBUG3
+ XBT_DEBUG
("Do not override configuration variable '%s' with value '%s:%d' because it was already set.",
name, host, port);
}
{
xbt_cfgelm_t variable;
- VERB2("Configuration setting: %s=%d", name, val);
+ XBT_VERB("Configuration setting: %s=%d", name, val);
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
if (variable->max == 1) {
{
xbt_cfgelm_t variable;
- VERB2("Configuration setting: %s=%f", name, val);
+ XBT_VERB("Configuration setting: %s=%f", name, val);
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
if (variable->max == 1) {
xbt_cfgelm_t variable;
char *newval = xbt_strdup(val);
- VERB2("Configuration setting: %s=%s", name, val);
+ XBT_VERB("Configuration setting: %s=%s", name, val);
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
- DEBUG5("Variable: %d to %d %s (=%d) @%p",
+ XBT_DEBUG("Variable: %d to %d %s (=%d) @%p",
variable->min, variable->max,
xbt_cfgelm_type_name[variable->type], variable->type, variable);
xbt_cfgelm_t variable;
xbt_peer_t val = xbt_peer_new(peer, port);
- VERB3("Configuration setting: %s=%s:%d", name, peer, port);
+ XBT_VERB("Configuration setting: %s=%s:%d", name, peer, port);
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
xbt_dynar_reset(variable->content);
}
}
+/*
+ * Say if the value is the default value
+ */
+int xbt_cfg_is_default_value(xbt_cfg_t cfg, const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_any);
+ return variable->isdefault;
+}
/*----[ Getting ]---------------------------------------------------------*/
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
if (xbt_dynar_length(variable->content) > 1) {
- WARN2
+ XBT_WARN
("You asked for the first value of the config element '%s', but there is %lu values",
name, xbt_dynar_length(variable->content));
}
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
if (xbt_dynar_length(variable->content) > 1) {
- WARN2
+ XBT_WARN
("You asked for the first value of the config element '%s', but there is %lu values\n",
name, xbt_dynar_length(variable->content));
}
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
if (xbt_dynar_length(variable->content) > 1) {
- WARN2
+ XBT_WARN
("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) {
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
if (xbt_dynar_length(variable->content) > 1) {
- WARN2
+ XBT_WARN
("You asked for the first value of the config element '%s', but there is %lu values\n",
name, xbt_dynar_length(variable->content));
}