XBT_DEBUG("Copy cfg set %p", tocopy);
*whereto = NULL;
- xbt_assert0(tocopy, "cannot copy NULL config");
+ xbt_assert(tocopy, "cannot copy NULL config");
xbt_dict_foreach((xbt_dict_t) tocopy, cursor, name, variable) {
xbt_cfg_register(whereto, name, variable->desc, variable->type, NULL,
if (*cfg == NULL)
*cfg = xbt_cfg_new();
- xbt_assert4(type >= xbt_cfgelm_int && type <= xbt_cfgelm_peer,
+ xbt_assert(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);
* 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
+ * FIXME: this does not allow to set the description
*/
void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
XBT_DEBUG("Register string '%s'", entry);
tok = strchr(entrycpy, ':');
- xbt_assert2(tok, "Invalid config element descriptor: %s%s",
+ xbt_assert(tok, "Invalid config element descriptor: %s%s",
entry, "; Should be <name>:<min nb>_to_<max nb>_<type>");
*(tok++) = '\0';
min = strtol(tok, &tok, 10);
- xbt_assert1(tok, "Invalid minimum in config element descriptor %s",
+ xbt_assert(tok, "Invalid minimum in config element descriptor %s",
entry);
- xbt_assert2(strcmp(tok, "_to_"),
+ xbt_assert(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);
- xbt_assert1(tok, "Invalid maximum in config element descriptor %s",
+ xbt_assert(tok, "Invalid maximum in config element descriptor %s",
entry);
- xbt_assert2(*tok == '_',
+ xbt_assert(*tok == '_',
"Invalid config element descriptor: %s%s", entry,
"; Should be <name>:<min nb>_to_<max nb>_<type>");
tok++;
for (type = 0;
type < xbt_cfgelm_type_count
&& strcmp(tok, xbt_cfgelm_type_name[type]); type++);
- xbt_assert2(type < xbt_cfgelm_type_count,
+ xbt_assert(type < xbt_cfgelm_type_count,
"Invalid type in config element descriptor: %s%s", entry,
"; Should be one of 'string', 'int', 'peer' or 'double'.");
char *name;
int size;
- xbt_assert0(cfg, "NULL config set.");
+ xbt_assert(cfg, "NULL config set.");
XBT_DEBUG("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,
+ THROWF(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,
+ THROWF(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);
res = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
if (!res) {
xbt_cfg_help(cfg);
- THROW1(not_found_error, 0,
+ THROWF(not_found_error, 0,
"No registered variable '%s' in this config set", name);
}
- xbt_assert3(type == xbt_cfgelm_any || res->type == type,
+ xbt_assert(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]);
variable = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
if (!variable)
- THROW1(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't get the type of '%s' since this variable does not exist",
name);
TRY {
type = xbt_cfg_get_type(cfg, name);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
- THROW1(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't set the property '%s' since it's not registered",
name);
}
double d;
char *str;
- xbt_cfgelm_t variable = NULL;
+ volatile xbt_cfgelm_t variable = NULL;
char *optionlist_cpy;
char *option, *name, *val;
}
*(val++) = '\0';
- if (strcmp(name,"contexts/factory"))
+ if (strncmp(name, "contexts/", strlen("contexts/")))
XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
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);
if (e.category == not_found_error) {
xbt_ex_free(e);
- THROW1(not_found_error, 0,
- "No registered variable corresponding to '%s'.", name);
+ TRY {
+ THROWF(not_found_error, 0,
+ "No registered variable corresponding to '%s'.", name);
+ }
+ TRY_CLEANUP {
+ /* name points into optionlist_cpy, it cannot be freed before */
+ free(optionlist_cpy);
+ }
+ CATCH_ANONYMOUS {
+ RETHROW;
+ }
}
+ free(optionlist_cpy);
RETHROW;
}
break;
default:
- THROW1(unknown_error, 0, "Type of config element %s is not valid.",
+ THROWF(unknown_error, 0, "Type of config element %s is not valid.",
name);
}
}
- CATCH(e) {
+ CATCH_ANONYMOUS {
free(optionlist_cpy);
RETHROW;
}
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
if (variable->max == 1) {
- if (variable->cb_rm && xbt_dynar_length(variable->content))
- (*variable->cb_rm) (name, 0);
+ if (variable->cb_rm && !xbt_dynar_is_empty(variable->content))
+ variable->cb_rm(name, 0);
xbt_dynar_set(variable->content, 0, &val);
} else {
if (variable->max
&& xbt_dynar_length(variable->content) ==
(unsigned long) variable->max)
- THROW3(mismatch_error, 0,
+ THROWF(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);
+ variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
variable->isdefault = 0;
}
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);
+ if (variable->cb_rm && !xbt_dynar_is_empty(variable->content))
+ variable->cb_rm(name, 0);
xbt_dynar_set(variable->content, 0, &val);
} else {
if (variable->max
&& xbt_dynar_length(variable->content) == variable->max)
- THROW3(mismatch_error, 0,
+ THROWF(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);
+ variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
variable->isdefault = 0;
}
xbt_cfgelm_type_name[variable->type], variable->type, variable);
if (variable->max == 1) {
- if (xbt_dynar_length(variable->content)) {
+ if (!xbt_dynar_is_empty(variable->content)) {
if (variable->cb_rm)
- (*variable->cb_rm) (name, 0);
+ variable->cb_rm(name, 0);
else if (variable->type == xbt_cfgelm_string) {
char *sval = xbt_dynar_get_as(variable->content, 0, char *);
free(sval);
} else {
if (variable->max
&& xbt_dynar_length(variable->content) == variable->max)
- THROW3(mismatch_error, 0,
+ THROWF(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);
+ variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
variable->isdefault = 0;
}
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);
+ if (variable->cb_rm && !xbt_dynar_is_empty(variable->content))
+ variable->cb_rm(name, 0);
xbt_dynar_set(variable->content, 0, &val);
} else {
if (variable->max
&& xbt_dynar_length(variable->content) == variable->max)
- THROW4(mismatch_error, 0,
+ THROWF(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);
}
if (variable->cb_set)
- (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1);
+ variable->cb_set(name, xbt_dynar_length(variable->content) - 1);
variable->isdefault = 0;
}
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int);
if (xbt_dynar_length(variable->content) == variable->min)
- THROW3(mismatch_error, 0,
+ THROWF(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) {
if (variable->cb_rm)
- (*variable->cb_rm) (name, cpt);
+ variable->cb_rm(name, cpt);
xbt_dynar_cursor_rm(variable->content, &cpt);
return;
}
}
- THROW2(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't remove the value %d of config element %s: value not found.",
val, name);
}
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double);
if (xbt_dynar_length(variable->content) == variable->min)
- THROW3(mismatch_error, 0,
+ THROWF(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);
if (seen == val) {
xbt_dynar_cursor_rm(variable->content, &cpt);
if (variable->cb_rm)
- (*variable->cb_rm) (name, cpt);
+ variable->cb_rm(name, cpt);
return;
}
}
- THROW2(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't remove the value %f of config element %s: value not found.",
val, name);
}
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string);
if (xbt_dynar_length(variable->content) == variable->min)
- THROW3(mismatch_error, 0,
+ THROWF(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);
+ variable->cb_rm(name, cpt);
xbt_dynar_cursor_rm(variable->content, &cpt);
return;
}
}
- THROW2(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't remove the value %s of config element %s: value not found.",
val, name);
}
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer);
if (xbt_dynar_length(variable->content) == variable->min)
- THROW4(mismatch_error, 0,
+ THROWF(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);
+ variable->cb_rm(name, cpt);
xbt_dynar_cursor_rm(variable->content, &cpt);
return;
}
}
- THROW3(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't remove the value %s:%d of config element %s: value not found.",
peer, port, name);
}
variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_any);
if (xbt_dynar_length(variable->content) == variable->min)
- THROW3(mismatch_error, 0,
+ THROWF(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);
if (variable->cb_rm)
- (*variable->cb_rm) (name, pos);
+ variable->cb_rm(name, pos);
xbt_dynar_remove_at(variable->content, pos, NULL);
}
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category != not_found_error)
RETHROW;
xbt_ex_free(e);
- THROW1(not_found_error, 0,
+ THROWF(not_found_error, 0,
"Can't empty '%s' since this config element does not exist",
name);
}
unsigned int cpt;
void *ignored;
xbt_dynar_foreach(variable->content, cpt, ignored) {
- (*variable->cb_rm) (name, cpt);
+ variable->cb_rm(name, cpt);
}
}
xbt_dynar_reset(variable->content);
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) {
+ } else if (xbt_dynar_is_empty(variable->content)) {
return NULL;
}
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
- THROW1(not_found_error, 0,
+ THROWF(not_found_error, 0,
"No registered variable %s in this config set", name);
}
RETHROW;
TRY {
xbt_cfg_set_parse(myset, "color:blue");
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);