#include "xbt/peer.h"
#include "xbt/config.h" /* prototypes of this module */
+#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+
+xbt_lib_t host_lib;
+int COORD_HOST_LEVEL; //Coordinates level
+xbt_lib_t as_router_lib;
+int COORD_ASR_LEVEL; //Coordinates level
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
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");
+ 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,
/** @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);
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);
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);
}
* 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)
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",
+ 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'.");
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 */
char *name;
int size;
- xbt_assert0(cfg, "NULL config set.");
- DEBUG1("Check cfg set %p", cfg);
+ 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);
- INFO1("type in variable = %d", variable->type);
+ XBT_INFO("type in variable = %d", variable->type);
return variable->type;
}
} 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);
}
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';
- if(strcmp(name,"simix/context"))
- INFO2("Configuration change: Set '%s' to '%s'", name, val);
+ if (!strcmp(name,"coordinates")){
+ if(!strcmp(val,"yes") && !COORD_HOST_LEVEL){
+ XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
+ COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+ COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+ free(optionlist_cpy);
+ return;
+ }
+ if(strcmp(val,"yes"))
+ xbt_die("Setting CMD prop coordinates must be \"yes\"");
+ }
+
+ 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);
free(optionlist_cpy);
if (e.category == not_found_error) {
xbt_ex_free(e);
- THROW1(not_found_error, 0,
+ THROWF(not_found_error, 0,
"No registered variable corresponding to '%s'.", name);
}
RETHROW;
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 */
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);
}
}
variable->isdefault = 1;
}
else
- DEBUG2
+ XBT_DEBUG
("Do not override configuration variable '%s' with value '%d' because it was already set.",
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);
}
variable->isdefault = 1;
}
else
- DEBUG2
+ XBT_DEBUG
("Do not override configuration variable '%s' with value '%s' because it was already set.",
name, val);
}
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) {
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);
{
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) {
} 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);
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);
} 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);
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);
} 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);
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);
}
}
- 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);
}
}
- 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);
}
}
- 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);
}
}
- 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);
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);
}
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));
}
} 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;
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_test_add("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_t set = set = make_set();
xbt_ex_t e;
- xbt_test_add0("Having too few elements for speed");
+ xbt_test_add("Having too few elements for speed");
xbt_cfg_set_parse(set,
"peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
TRY {
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_test_fail("Got an exception. msg=%s", e.msg);
xbt_ex_free(e);
}
xbt_cfg_free(&set);
- xbt_test_add0("Having too much values of 'speed'");
+ xbt_test_add("Having too much values of 'speed'");
set = make_set();
xbt_cfg_set_parse(set, "peername:toto:42 user:alegrand");
TRY {
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_test_fail("Got an exception. msg=%s", e.msg);
xbt_ex_free(e);
}
xbt_cfg_check(set);
XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
{
- xbt_test_add0("Get a single value");
+ xbt_test_add("Get a single value");
{
/* get_single_value */
int ival;
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_test_fail("Speed value = %d, I expected 42", ival);
xbt_cfg_free(&myset);
}
- xbt_test_add0("Get multiple values");
+ xbt_test_add("Get multiple values");
{
/* get_multiple_value */
xbt_dynar_t dyn;
dyn = xbt_cfg_get_dynar(myset, "user");
if (xbt_dynar_length(dyn) != 3)
- xbt_test_fail1("Dynar length = %lu, I expected 3",
+ xbt_test_fail("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_test_fail("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_test_fail("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_test_fail("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");
+ xbt_test_add("Access to a non-existant entry");
{
/* non-existant_entry */
xbt_cfg_t myset = make_set();
