X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b034dec40bc1f38856fe1d599d0ab5a3174780f7..5e61205077b453d1460c7008d1af3a68e6667db6:/src/xbt/config.c diff --git a/src/xbt/config.c b/src/xbt/config.c index f5541c08f0..0e532308ef 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -1,10 +1,9 @@ -/* $Id$ */ - /* config - Dictionnary where the type of each variable is provided. */ /* This is useful to build named structs, like option or property sets. */ -/* Copyright (c) 2001,2002,2003,2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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. */ @@ -19,6 +18,12 @@ #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"); @@ -34,6 +39,7 @@ typedef struct { /* Allowed type of the variable */ e_xbt_cfgelm_type_t type; int min, max; + int isdefault:1; /* Callbacks */ xbt_cfg_cb_t cb_set; @@ -45,7 +51,7 @@ typedef struct { } s_xbt_cfgelm_t, *xbt_cfgelm_t; static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] = - { "int", "double", "string", "peer", "any" }; + { "int", "double", "string", "peer", "any" }; /* Internal stuff used in cache to free a variable */ static void xbt_cfgelm_free(void *data); @@ -81,9 +87,9 @@ void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto) 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, @@ -95,7 +101,7 @@ void xbt_cfg_cpy(xbt_cfg_t tocopy, xbt_cfg_t * whereto) /** @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); } @@ -126,9 +132,10 @@ void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg) size = xbt_dynar_length(variable->content); printf - ("%d_to_%d_%s. Actual size=%d. prerm=%p,postset=%p, List of values:\n", - variable->min, variable->max, xbt_cfgelm_type_name[variable->type], - size, variable->cb_rm, variable->cb_set); + ("%d_to_%d_%s. Actual size=%d. prerm=%p,postset=%p, List of values:\n", + variable->min, variable->max, + xbt_cfgelm_type_name[variable->type], size, variable->cb_rm, + variable->cb_set); switch (variable->type) { @@ -182,7 +189,7 @@ void xbt_cfgelm_free(void *data) { 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); @@ -202,27 +209,28 @@ void xbt_cfgelm_free(void *data) void xbt_cfg_register(xbt_cfg_t * cfg, - const char *name, const char *desc, e_xbt_cfgelm_type_t type, - void *default_value, int min, int max, xbt_cfg_cb_t cb_set, - xbt_cfg_cb_t cb_rm) + const char *name, const char *desc, + e_xbt_cfgelm_type_t type, void *default_value, int min, + int max, xbt_cfg_cb_t cb_set, xbt_cfg_cb_t cb_rm) { xbt_cfgelm_t res; 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)", - name, desc, min, max, xbt_cfgelm_type_name[type], type, res, *cfg); + 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); res->desc = xbt_strdup(desc); res->type = type; @@ -230,6 +238,7 @@ xbt_cfg_register(xbt_cfg_t * cfg, res->max = max; res->cb_set = cb_set; res->cb_rm = cb_rm; + res->isdefault = 1; switch (type) { case xbt_cfgelm_int: @@ -257,7 +266,7 @@ xbt_cfg_register(xbt_cfg_t * 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); @@ -274,7 +283,7 @@ xbt_cfg_register(xbt_cfg_t * cfg, 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); } @@ -288,7 +297,7 @@ void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name) * Each of them must use the following syntax: \:\_to_\_\ * 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) @@ -298,32 +307,35 @@ 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 :_to__"); *(tok++) = '\0'; min = strtol(tok, &tok, 10); - xbt_assert1(tok, "Invalid minimum in config element descriptor %s", entry); + 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 :_to__"); tok += strlen("_to_"); max = strtol(tok, &tok, 10); - xbt_assert1(tok, "Invalid maximum in config element descriptor %s", entry); + 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 :_to__"); + 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'."); @@ -332,21 +344,38 @@ void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry) 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) - printf("Arrity: min:%d to max:%d; ", variable->min, variable->max); + if (variable->min != 1 || variable->max != 1) { + if (variable->min == 0 && variable->max == 0) + printf("Arity: no bound; "); + else + printf("Arity: min:%d to max:%d; ", variable->min, variable->max); + } printf("Current value: "); size = xbt_dynar_length(variable->content); @@ -390,6 +419,8 @@ void xbt_cfg_help(xbt_cfg_t cfg) } } + + xbt_dynar_free(&names); } /** @brief Check that each variable have the right amount of values */ @@ -400,23 +431,25 @@ void xbt_cfg_check(xbt_cfg_t cfg) 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); + 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); + name, variable->max, xbt_cfgelm_type_name[variable->type], + size); } } @@ -424,18 +457,19 @@ void xbt_cfg_check(xbt_cfg_t cfg) } static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, - const char *name, e_xbt_cfgelm_type_t type) + const char *name, + e_xbt_cfgelm_type_t type) { xbt_cfgelm_t res = NULL; 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]); @@ -458,11 +492,11 @@ e_xbt_cfgelm_type_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name) 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; } @@ -490,8 +524,9 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) } 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); + THROWF(not_found_error, 0, + "Can't set the property '%s' since it's not registered", + name); } RETHROW; } @@ -519,8 +554,7 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) 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); } } @@ -566,13 +600,13 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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 */ @@ -580,21 +614,21 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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 */ @@ -607,7 +641,7 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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; @@ -617,26 +651,38 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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,"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); } 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 registrated variable corresponding to '%s'.", name); + name = xbt_strdup(name); + free(optionlist_cpy); + THROWF(not_found_error, 0, + "No registered variable corresponding to '%s'.", name); } + free(optionlist_cpy); RETHROW; } @@ -650,9 +696,7 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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 */ @@ -662,9 +706,7 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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 */ @@ -675,25 +717,23 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) 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); } } @@ -706,6 +746,84 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) } +/** @brief Set an integer value to \a name within \a cfg if it wasn't changed yet + * + * This is useful to change the default value of a variable while allowing + * users to override it with command line arguments + */ +void xbt_cfg_setdefault_int(xbt_cfg_t cfg, const char *name, int val) +{ + xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int); + + if (variable->isdefault){ + xbt_cfg_set_int(cfg, name, val); + variable->isdefault = 1; + } + else + XBT_DEBUG + ("Do not override configuration variable '%s' with value '%d' because it was already set.", + name, val); +} + +/** @brief Set an integer value to \a name within \a cfg if it wasn't changed yet + * + * This is useful to change the default value of a variable while allowing + * users to override it with command line arguments + */ +void xbt_cfg_setdefault_double(xbt_cfg_t cfg, const char *name, double val) +{ + xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_double); + + if (variable->isdefault) { + xbt_cfg_set_double(cfg, name, val); + variable->isdefault = 1; + } + else + XBT_DEBUG + ("Do not override configuration variable '%s' with value '%lf' because it was already set.", + name, val); +} + +/** @brief Set a string value to \a name within \a cfg if it wasn't changed yet + * + * This is useful to change the default value of a variable while allowing + * users to override it with command line arguments + */ +void xbt_cfg_setdefault_string(xbt_cfg_t cfg, const char *name, + const char *val) +{ + xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_string); + + if (variable->isdefault){ + xbt_cfg_set_string(cfg, name, val); + variable->isdefault = 1; + } + else + XBT_DEBUG + ("Do not override configuration variable '%s' with value '%s' because it was already set.", + name, val); +} + +/** @brief Set a peer value to \a name within \a cfg if it wasn't changed yet + * + * This is useful to change the default value of a variable while allowing + * users to override it with command line arguments + */ +void xbt_cfg_setdefault_peer(xbt_cfg_t cfg, const char *name, + const char *host, int port) +{ + xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer); + + if (variable->isdefault){ + xbt_cfg_set_peer(cfg, name, host, port); + variable->isdefault = 1; + } + else + XBT_DEBUG + ("Do not override configuration variable '%s' with value '%s:%d' because it was already set.", + name, host, port); +} + /** @brief Set or add an integer value to \a name within \a cfg * * \arg cfg the config set @@ -716,7 +834,7 @@ void xbt_cfg_set_int(xbt_cfg_t cfg, const char *name, int val) { 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) { @@ -728,7 +846,7 @@ void xbt_cfg_set_int(xbt_cfg_t cfg, const char *name, int val) 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); @@ -737,6 +855,7 @@ void xbt_cfg_set_int(xbt_cfg_t cfg, const char *name, int val) if (variable->cb_set) (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1); + variable->isdefault = 0; } /** @brief Set or add a double value to \a name within \a cfg @@ -750,7 +869,7 @@ void xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, double val) { 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) { @@ -759,8 +878,9 @@ void xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, double val) xbt_dynar_set(variable->content, 0, &val); } else { - if (variable->max && xbt_dynar_length(variable->content) == variable->max) - THROW3(mismatch_error, 0, + if (variable->max + && xbt_dynar_length(variable->content) == variable->max) + THROWF(mismatch_error, 0, "Cannot add value %f to the config element %s since it's already full (size=%d)", val, name, variable->max); @@ -769,6 +889,7 @@ void xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, double val) if (variable->cb_set) (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1); + variable->isdefault = 0; } /** @brief Set or add a string value to \a name within \a cfg @@ -784,11 +905,11 @@ void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val) 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", - variable->min, variable->max, xbt_cfgelm_type_name[variable->type], - variable->type, variable); + XBT_DEBUG("Variable: %d to %d %s (=%d) @%p", + variable->min, variable->max, + xbt_cfgelm_type_name[variable->type], variable->type, variable); if (variable->max == 1) { if (xbt_dynar_length(variable->content)) { @@ -802,8 +923,9 @@ void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val) xbt_dynar_set(variable->content, 0, &newval); } else { - if (variable->max && xbt_dynar_length(variable->content) == variable->max) - THROW3(mismatch_error, 0, + if (variable->max + && xbt_dynar_length(variable->content) == variable->max) + THROWF(mismatch_error, 0, "Cannot add value %s to the config element %s since it's already full (size=%d)", name, val, variable->max); @@ -812,6 +934,7 @@ void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val) if (variable->cb_set) (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1); + variable->isdefault = 0; } /** @brief Set or add an peer value to \a name within \a cfg @@ -825,12 +948,13 @@ void xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val) */ void -xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port) +xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, const char *peer, + int port) { 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); @@ -840,8 +964,9 @@ xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port) xbt_dynar_set(variable->content, 0, &val); } else { - if (variable->max && xbt_dynar_length(variable->content) == variable->max) - THROW4(mismatch_error, 0, + if (variable->max + && xbt_dynar_length(variable->content) == variable->max) + 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); @@ -850,6 +975,7 @@ xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port) if (variable->cb_set) (*variable->cb_set) (name, xbt_dynar_length(variable->content) - 1); + variable->isdefault = 0; } /* ---- [ Removing ] ---- */ @@ -870,7 +996,7 @@ void xbt_cfg_rm_int(xbt_cfg_t cfg, const char *name, int val) 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); @@ -883,7 +1009,7 @@ void xbt_cfg_rm_int(xbt_cfg_t cfg, const char *name, int val) } } - 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); } @@ -904,7 +1030,7 @@ void xbt_cfg_rm_double(xbt_cfg_t cfg, const char *name, double val) 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); @@ -917,7 +1043,7 @@ void xbt_cfg_rm_double(xbt_cfg_t cfg, const char *name, double val) } } - 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); } @@ -937,7 +1063,7 @@ void xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name, const char *val) 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); @@ -950,7 +1076,7 @@ void xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name, const char *val) } } - 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); } @@ -964,7 +1090,8 @@ void xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name, const char *val) */ void -xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port) +xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, const char *peer, + int port) { xbt_cfgelm_t variable; unsigned int cpt; @@ -973,7 +1100,7 @@ xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port) 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); @@ -986,7 +1113,7 @@ xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, const char *peer, int port) } } - 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); } @@ -1001,7 +1128,7 @@ void xbt_cfg_rm_at(xbt_cfg_t cfg, const char *name, int pos) 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); @@ -1028,7 +1155,7 @@ void xbt_cfg_empty(xbt_cfg_t cfg, const char *name) 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); } @@ -1044,6 +1171,14 @@ void xbt_cfg_empty(xbt_cfg_t cfg, const char *name) 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 ]---------------------------------------------------------*/ @@ -1064,9 +1199,9 @@ 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)); + XBT_WARN + ("You asked for the first value of the config element '%s', but there is %lu values", + name, xbt_dynar_length(variable->content)); } return xbt_dynar_get_as(variable->content, 0, int); @@ -1090,9 +1225,9 @@ 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)); + 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)); } return xbt_dynar_get_as(variable->content, 0, double); @@ -1116,9 +1251,9 @@ 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)); + 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) { return NULL; } @@ -1140,7 +1275,8 @@ char *xbt_cfg_get_string(xbt_cfg_t cfg, const char *name) * \warning the returned value is the actual content of the config set */ -void xbt_cfg_get_peer(xbt_cfg_t cfg, const char *name, char **peer, int *port) +void xbt_cfg_get_peer(xbt_cfg_t cfg, const char *name, char **peer, + int *port) { xbt_cfgelm_t variable; xbt_peer_t val; @@ -1148,9 +1284,9 @@ void xbt_cfg_get_peer(xbt_cfg_t cfg, const char *name, char **peer, int *port) 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)); + 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)); } val = xbt_dynar_get_as(variable->content, 0, xbt_peer_t); @@ -1178,7 +1314,7 @@ xbt_dynar_t xbt_cfg_get_dynar(xbt_cfg_t cfg, const char *name) } 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; @@ -1232,6 +1368,7 @@ xbt_cfg_get_peer_at(xbt_cfg_t cfg, const char *name, int pos, #include "xbt/ex.h" XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); +XBT_LOG_DEFAULT_CATEGORY(xbt_cfg); XBT_TEST_SUITE("config", "Configuration support"); @@ -1250,7 +1387,7 @@ static xbt_cfg_t 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_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); @@ -1262,7 +1399,7 @@ 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_test_add("Having too few elements for speed"); xbt_cfg_set_parse(set, "peername:veloce user:mquinson\nuser:oaumage\tuser:alegrand"); TRY { @@ -1272,7 +1409,7 @@ XBT_TEST_UNIT("validation", test_config_validation, "Validation tests") 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); @@ -1280,7 +1417,7 @@ XBT_TEST_UNIT("validation", test_config_validation, "Validation tests") - 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 { @@ -1290,7 +1427,7 @@ XBT_TEST_UNIT("validation", test_config_validation, "Validation tests") 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); @@ -1302,7 +1439,7 @@ XBT_TEST_UNIT("validation", test_config_validation, "Validation tests") 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; @@ -1311,40 +1448,41 @@ XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests") 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; xbt_cfg_t myset = make_set(); - xbt_cfg_set_parse(myset, "peername:veloce user:foo\nuser:bar\tuser:toto"); + 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 = %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_dynar_get_as(dyn, 0, char *)); + 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_dynar_get_as(dyn, 1, char *)); + 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_dynar_get_as(dyn, 2, char *)); + 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(); @@ -1360,4 +1498,4 @@ XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests") xbt_cfg_free(&myset); } } -#endif /* SIMGRID_TEST */ +#endif /* SIMGRID_TEST */