/** \brief Callback types. They get the name of the modified entry, and the position of the changed value */
typedef void (*xbt_cfg_cb_t) (const char * name);
-typedef void (*xbt_cfg_cb_ext_t)(const char * name, void* cb_data);
-typedef void (*xbt_cfg_cb_free_t)(void* cb_data);
XBT_PUBLIC(xbt_cfg_t) xbt_cfg_new(void);
XBT_PUBLIC(void) xbt_cfg_free(xbt_cfg_t * cfg);
XBT_PUBLIC(void) xbt_cfg_register_alias(const char *newname, const char *oldname);
XBT_PUBLIC(void) xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry);
-XBT_PUBLIC(void) xbt_cfg_register_ext(
- const char *name, const char *desc, e_xbt_cfgelm_type_t type,
- xbt_cfg_cb_ext_t cb, void* data, xbt_cfg_cb_free_t data_free);
-
XBT_PUBLIC(void) xbt_cfg_aliases(void);
XBT_PUBLIC(void) xbt_cfg_help(void);
XBT_PUBLIC(e_xbt_cfgelm_type_t) xbt_cfg_get_type(xbt_cfg_t cfg, const char *name);
#ifndef _XBT_CONFIG_HPP_
#define _XBT_CONFIG_HPP_
+#include <cstdlib>
+
#include <functional>
+#include <stdexcept>
#include <string>
#include <type_traits>
+#include <utility>
#include <xbt/base.h>
#include <xbt/config.h>
namespace simgrid {
namespace config {
-/** Get the base type of a e_xbt_cfgelm_type_t
- *
- * * `type` is the type used in the config framework to store
- * the values of this type;
- *
- * * `get()` is used to get such a value from the configuration.
- */
-template<e_xbt_cfgelm_type_t type>
-struct base_type;
-template<> struct base_type<xbt_cfgelm_boolean> {
- typedef bool type;
- static inline bool get(const char* name)
+bool parseBool(const char* value);
+double parseDouble(const char* value);
+long int parseLong(const char* value);
+
+template<class T> struct parse_option {
+ static inline T parse(const char* value)
{
- return xbt_cfg_get_boolean(name) ? true : false;
+ return T(value);
}
};
-template<> struct base_type<xbt_cfgelm_int> {
- typedef int type;
- static inline int get(const char* name)
+
+template<> struct parse_option<std::string> {
+ static inline std::string parse(const char* value)
{
- return xbt_cfg_get_int(name);
+ return std::string(value);
}
};
-template<> struct base_type<xbt_cfgelm_double> {
- typedef double type;
- static inline double get(const char* name)
+
+template<>
+struct parse_option<double> {
+ static inline double parse(const char* value)
{
- return xbt_cfg_get_double(name);
+ return parseDouble(value);
}
};
-template<> struct base_type<xbt_cfgelm_string> {
- typedef std::string type;
- static inline std::string get(const char* name)
+
+template<>
+struct parse_option<int> {
+ static inline double parse(const char* value)
{
- char* value = xbt_cfg_get_string(name);
- return value != nullptr ? value : "";
+ return parseLong(value);
+ }
+};
+
+template<>
+struct parse_option<bool> {
+ static inline bool parse(const char* value)
+ {
+ return parseBool(value);
}
};
-/** Associate the e_xbt_cfgelm_type_t to use for a given type */
-template<class T>
-struct cfgelm_type : public std::integral_constant<e_xbt_cfgelm_type_t,
- std::is_same<T, bool>::value ? xbt_cfgelm_boolean :
- std::is_integral<T>::value ? xbt_cfgelm_int :
- std::is_floating_point<T>::value ? xbt_cfgelm_double :
- xbt_cfgelm_string>
-{};
-
-/** Get a value of a given type from the configuration */
-template<class T> inline
-T get(const char* name)
-{
- return T(base_type<cfgelm_type<T>::value>::get(name));
-}
template<class T> inline
-T get(std::string const& name)
+T parse(const char* value)
{
- return T(base_type<cfgelm_type<T>::value>::get(name.c_str()));
+ return parse_option<T>::parse(value);
}
-inline void setDefault(const char* name, int value)
-{
- xbt_cfg_setdefault_int(name, value);
-}
-inline void setDefault(const char* name, double value)
-{
- xbt_cfg_setdefault_double(name, value);
-}
-inline void setDefault(const char* name, const char* value)
+template<class T> inline
+std::string to_string(T&& value)
{
- xbt_cfg_setdefault_string(name, value);
+ return std::to_string(std::forward<T>(value));
}
-inline void setDefault(const char* name, std::string const& value)
+inline std::string const& to_string(std::string& value)
{
- xbt_cfg_setdefault_string(name, value.c_str());
+ return value;
}
-inline void setDefault(const char* name, bool value)
+inline std::string const& to_string(std::string const& value)
{
- xbt_cfg_setdefault_boolean(name, value ? "yes" : "no");
+ return value;
}
-
-/** Set the default value of a given configuration option */
-template<class T> inline
-void setDefault(const char* name, T value)
+inline std::string to_string(std::string&& value)
{
- setDefault(name, base_type<cfgelm_type<T>::value>::type(value));
+ return std::move(value);
}
// Register:
*
* @param name name of the option
* @param description Description of the option
- * @param type config storage type for the option
- * @param callback called with the option name (expected to use `simgrid::config::get`)
+ * @param callback called with the option value
*/
-XBT_PUBLIC(void) registerConfig(const char* name, const char* description,
- e_xbt_cfgelm_type_t type,
- std::function<void(const char*)> callback);
+XBT_PUBLIC(void) declareFlag(const char* name, const char* description,
+ std::function<void(const char* value)> callback);
/** Bind a variable to configuration flag
*
* @param description Option description
*/
template<class T>
-void declareFlag(T& value, const char* name, const char* description)
+void bindFlag(T& value, const char* name, const char* description)
{
- registerConfig(name, description, cfgelm_type<T>::value,
- [&value](const char* name) {
- value = simgrid::config::get<T>(name);
- });
- setDefault(name, value);
+ using namespace std;
+ declareFlag(name, description, [&value](const char* val) {
+ value = simgrid::config::parse<T>(val);
+ });
+ xbt_cfg_setdefault_string(name, simgrid::config::to_string(value).c_str());
}
/** Bind a variable to configuration flag
*
- * @param value Bound variable
- * @param name Flag name
- * @param description Option description
- * @f Callback (called with the option name) providing the value
+ * <pre><code>
+ * static int x;
+ * simgrid::config::bindFlag(a, "x", [](const char* value) {
+ * return simgrid::config::parse(value);
+ * }
+ * </pre><code>
+ */
+// F is a parser, F : const char* -> T
+template<class T, class F>
+typename std::enable_if<std::is_same<
+ T,
+ typename std::remove_cv< decltype(
+ std::declval<F>()(std::declval<const char*>())
+ ) >::type
+>::value, void>::type
+bindFlag(T& value, const char* name, const char* description,
+ F callback)
+{
+ declareFlag(name, description, [&value,callback](const char* val) {
+ value = callback(val);
+ });
+ xbt_cfg_setdefault_string(name, to_string(value).c_str());
+}
+
+/** Bind a variable to configuration flag
+ *
+ * <pre><code>
+ * static int x;
+ * simgrid::config::bindFlag(a, "x", [](int x) {
+ * if (x < x_min || x => x_max)
+ * throw std::range_error("must be in [x_min, x_max)")
+ * });
+ * </pre><code>
*/
+// F is a checker, F : T& -> ()
template<class T, class F>
-void declareFlag(T& value, const char* name, const char* description, F f)
+typename std::enable_if<std::is_same<
+ void,
+ decltype( std::declval<F>()(std::declval<const T&>()) )
+>::value, void>::type
+bindFlag(T& value, const char* name, const char* description,
+ F callback)
{
- registerConfig(name, description, cfgelm_type<T>::value,
- [&value,f](const char* name) {
- value = f(name);
- });
- setDefault(name, value);
+ declareFlag(name, description, [&value,callback](const char* val) {
+ T res = parse<T>(val);
+ callback(res);
+ value = std::move(res);
+ });
+ xbt_cfg_setdefault_string(name, to_string(value).c_str());
+}
+
+/** Bind a variable to configuration flag
+ *
+ * <pre><code>
+ * static int x;
+ * simgrid::config::bindFlag(a, "x", [](int x) { return return x > 0; });
+ * </pre><code>
+ */
+// F is a predicate, F : T const& -> bool
+template<class T, class F>
+typename std::enable_if<std::is_same<
+ bool,
+ decltype( std::declval<F>()(std::declval<const T&>()) )
+>::value, void>::type
+bindFlag(T& value, const char* name, const char* description,
+ F callback)
+{
+ declareFlag(name, description, [&value,callback](const char* val) {
+ T res = parse<T>(val);
+ if (!callback(res))
+ throw std::range_error("invalid value");
+ value = std::move(res);
+ });
+ xbt_cfg_setdefault_string(name, to_string(value).c_str());
}
/** A variable bound to a CLI option
* </code></pre>
*/
template<class T>
-class flag {
+class Flag {
T value_;
public:
* @param desc Flag description
* @param value Flag initial/default value
*/
- flag(const char* name, const char* desc, T value) : value_(value)
+ Flag(const char* name, const char* desc, T value) : value_(value)
{
- declareFlag(value_, name, desc);
+ simgrid::config::bindFlag(value_, name, desc);
+ }
+
+ template<class F>
+ Flag(const char* name, const char* desc, T value, F callback) : value_(value)
+ {
+ simgrid::config::bindFlag(value_, name, desc, std::move(callback));
}
// No copy:
- flag(flag const&) = delete;
- flag& operator=(flag const&) = delete;
+ Flag(Flag const&) = delete;
+ Flag& operator=(Flag const&) = delete;
// Get the underlying value:
T& get() { return value_; }
// Implicit conversion to the underlying type:
operator T&() { return value_; }
operator T const&() const{ return value_; }
+
+ // Basic interop with T:
+ Flag& operator=(T const& that) { value_ = that; return *this; }
+ Flag& operator=(T && that) { value_ = that; return *this; }
+ bool operator==(T const& that) const { return value_ == that; }
+ bool operator!=(T const& that) const { return value_ != that; }
+ bool operator<(T const& that) const { return value_ < that; }
+ bool operator>(T const& that) const { return value_ > that; }
+ bool operator<=(T const& that) const { return value_ <= that; }
+ bool operator>=(T const& that) const { return value_ >= that; }
};
}
+++ /dev/null
-/* config - Dictionnary where the type of each variable is provided. */
-
-/* This is useful to build named structs, like option or property sets. */
-
-/* Copyright (c) 2004-2014. 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. */
-
-#include "xbt/misc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/ex.h"
-#include "xbt/dynar.h"
-#include "xbt/dict.h"
-
-#include <stdio.h>
-
-#include "xbt/config.h" /* prototypes of this module */
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
-
-XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = NULL;
-
-/* xbt_cfgelm_t: the typedef corresponding to a config variable. */
-
-typedef struct {
- /* Description */
- char *desc;
-
- /* Allowed type of the variable */
- e_xbt_cfgelm_type_t type;
- unsigned isdefault:1;
-
- /* Callbacks */
- xbt_cfg_cb_t cb_set;
-
- /* Advanced callbacks */
- xbt_cfg_cb_ext_t cb_set_ext;
- void* cb_set_data;
- xbt_cfg_cb_free_t cb_set_free;
-
- /* actual content (could be an union or something) */
- xbt_dynar_t content;
-} s_xbt_cfgelm_t, *xbt_cfgelm_t;
-
-static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] = { "int", "double", "string", "boolean", "any", "outofbound" };
-
-const struct xbt_boolean_couple xbt_cfgelm_boolean_values[] = {
- { "yes", "no"},
- { "on", "off"},
- {"true", "false"},
- { "1", "0"},
- { NULL, NULL}
-};
-
-/* Internal stuff used in cache to free a variable */
-static void xbt_cfgelm_free(void *data);
-
-/* Retrieve the variable we'll modify */
-static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm_type_t type);
-
-/*----[ Memory management ]-----------------------------------------------*/
-/** @brief Constructor
- *
- * Initialise a config set
- */
-xbt_cfg_t xbt_cfg_new(void)
-{
- return (xbt_cfg_t) xbt_dict_new_homogeneous(&xbt_cfgelm_free);
-}
-
-/** @brief Destructor */
-void xbt_cfg_free(xbt_cfg_t * cfg)
-{
- XBT_DEBUG("Frees cfg set %p", cfg);
- xbt_dict_free((xbt_dict_t *) cfg);
-}
-
-/** @brief Dump a config set for debuging purpose
- *
- * @param name The name to give to this config set
- * @param indent what to write at the beginning of each line (right number of spaces)
- * @param cfg the config set
- */
-void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
-{
- xbt_dict_t dict = (xbt_dict_t) cfg;
- xbt_dict_cursor_t cursor = NULL;
- xbt_cfgelm_t variable = NULL;
- char *key = NULL;
- int i;
- int size;
- int ival;
- char *sval;
- double dval;
-
- if (name)
- printf("%s>> Dumping of the config set '%s':\n", indent, name);
-
- xbt_dict_foreach(dict, cursor, key, variable) {
- printf("%s %s:", indent, key);
-
- size = xbt_dynar_length(variable->content);
- printf ("%s. Actual size=%d. postset=%p\n",
- xbt_cfgelm_type_name[variable->type], size, variable->cb_set);
-
- switch (variable->type) {
- case xbt_cfgelm_int:
- for (i = 0; i < size; i++) {
- ival = xbt_dynar_get_as(variable->content, i, int);
- printf("%s %d\n", indent, ival);
- }
- break;
- case xbt_cfgelm_double:
- for (i = 0; i < size; i++) {
- dval = xbt_dynar_get_as(variable->content, i, double);
- printf("%s %f\n", indent, dval);
- }
- break;
- case xbt_cfgelm_string:
- for (i = 0; i < size; i++) {
- sval = xbt_dynar_get_as(variable->content, i, char *);
- printf("%s %s\n", indent, sval);
- }
- break;
- case xbt_cfgelm_boolean:
- for (i = 0; i < size; i++) {
- ival = xbt_dynar_get_as(variable->content, i, int);
- printf("%s %d\n", indent, ival);
- }
- break;
- case xbt_cfgelm_alias:
- /* no content */
- break;
- default:
- printf("%s Invalid type!!\n", indent);
- break;
- }
- }
-
- if (name)
- printf("%s<< End of the config set '%s'\n", indent, name);
- fflush(stdout);
-
- xbt_dict_cursor_free(&cursor);
-}
-
-/*
- * free an config element
- */
-void xbt_cfgelm_free(void *data)
-{
- xbt_cfgelm_t c = (xbt_cfgelm_t) data;
-
- XBT_DEBUG("Frees cfgelm %p", c);
- if (!c)
- return;
- if (c->cb_set_free)
- c->cb_set_free(c->cb_set_data);
- xbt_free(c->desc);
- if (c->type != xbt_cfgelm_alias)
- xbt_dynar_free(&(c->content));
- free(c);
-}
-
-/*----[ Registering stuff ]-----------------------------------------------*/
-/** @brief Register an element within a config set
- *
- * @param cfg the config set
- * @param name the name of the config element
- * @param desc a description for this item (used by xbt_cfg_help())
- * @param type the type of the config element
- * @param cb_set callback function called when a value is set
- */
-static void xbt_cfg_register(
- xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt_cfgelm_type_t type,
- xbt_cfg_cb_t cb_set,
- xbt_cfg_cb_ext_t cb_set_ext, void* cb_set_data, xbt_cfg_cb_free_t cb_set_free)
-{
- if (*cfg == NULL)
- *cfg = xbt_cfg_new();
- xbt_assert(type >= xbt_cfgelm_int && type <= xbt_cfgelm_boolean,
- "type of %s not valid (%d should be between %d and %d)",
- name, (int)type, xbt_cfgelm_int, xbt_cfgelm_boolean);
-
- xbt_cfgelm_t res = xbt_dict_get_or_null((xbt_dict_t) * cfg, name);
- xbt_assert(NULL == res, "Refusing to register the config element '%s' twice.", name);
-
- res = xbt_new(s_xbt_cfgelm_t, 1);
- XBT_DEBUG("Register cfg elm %s (%s) (%s (=%d) @%p in set %p)",
- name, desc, xbt_cfgelm_type_name[type], (int)type, res, *cfg);
-
- res->desc = xbt_strdup(desc);
- res->type = type;
- res->cb_set = cb_set;
- res->cb_set_ext = cb_set_ext;
- res->cb_set_data = cb_set_data;
- res->cb_set_free = cb_set_free;
- res->isdefault = 1;
-
- switch (type) {
- case xbt_cfgelm_int:
- res->content = xbt_dynar_new(sizeof(int), NULL);
- break;
- case xbt_cfgelm_double:
- res->content = xbt_dynar_new(sizeof(double), NULL);
- break;
- case xbt_cfgelm_string:
- res->content = xbt_dynar_new(sizeof(char *), xbt_free_ref);
- break;
- case xbt_cfgelm_boolean:
- res->content = xbt_dynar_new(sizeof(int), NULL);
- break;
- default:
- XBT_ERROR("%d is an invalid type code", (int)type);
- break;
- }
- xbt_dict_set((xbt_dict_t) * cfg, name, res, NULL);
-}
-
-
-
-void xbt_cfg_register_double(const char *name, double default_value,xbt_cfg_cb_t cb_set, const char *desc){
- xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_double,cb_set, NULL, NULL, NULL);
- xbt_cfg_setdefault_double(name, default_value);
-}
-void xbt_cfg_register_int(const char *name, int default_value,xbt_cfg_cb_t cb_set, const char *desc) {
- xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_int,cb_set, NULL, NULL, NULL);
- xbt_cfg_setdefault_int(name, default_value);
-}
-void xbt_cfg_register_string(const char *name, const char *default_value, xbt_cfg_cb_t cb_set, const char *desc){
- xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_string,cb_set, NULL, NULL, NULL);
- xbt_cfg_setdefault_string(name, default_value);
-}
-void xbt_cfg_register_boolean(const char *name, const char*default_value,xbt_cfg_cb_t cb_set, const char *desc){
- xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_boolean,cb_set, NULL, NULL, NULL);
- xbt_cfg_setdefault_boolean(name, default_value);
-}
-
-/** Register a config with an extended callback
- *
- * @param name Name of the flag
- * @param desc Description of the flag
- * @param type Type of the flag
- * @param cb Extended callback
- * @param data Data associated with the callback
- * @param data_free Function used to free the callback data (or NULL)
- */
-void xbt_cfg_register_ext(const char *name, const char *desc, e_xbt_cfgelm_type_t type,
- xbt_cfg_cb_ext_t cb, void* data, xbt_cfg_cb_free_t data_free)
-{
- xbt_cfg_register(&simgrid_config, name, desc, type, NULL, cb, data, data_free);
-}
-
-void xbt_cfg_register_alias(const char *newname, const char *oldname)
-{
- if (simgrid_config == NULL)
- simgrid_config = xbt_cfg_new();
-
- xbt_cfgelm_t res = xbt_dict_get_or_null(simgrid_config, oldname);
- xbt_assert(NULL == res, "Refusing to register the option '%s' twice.", oldname);
-
- res = xbt_dict_get_or_null(simgrid_config, newname);
- xbt_assert(res, "Cannot define an alias to the non-existing option '%s'.", newname);
-
- res = xbt_new0(s_xbt_cfgelm_t, 1);
- XBT_DEBUG("Register cfg alias %s -> %s)",oldname,newname);
-
- res->desc = bprintf("Deprecated alias for %s",newname);
- res->type = xbt_cfgelm_alias;
- res->isdefault = 1;
- res->content = (xbt_dynar_t)newname;
-
- xbt_dict_set(simgrid_config, oldname, res, NULL);
-}
-
-/**
- * @brief Parse a string and register the stuff described.
- *
- * @param cfg the config set
- * @param entry a string describing the element to register
- *
- * The string may consist in several variable descriptions separated by a space.
- * Each of them must use the following syntax: \<name\>:\<type\>
- * with type being one of 'string','int','bool' or 'double'.
- *
- * Note that this does not allow to set the description, so you should prefer the other interface
- */
-void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
-{
- char *entrycpy = xbt_strdup(entry);
- char *tok;
-
- e_xbt_cfgelm_type_t type;
- XBT_DEBUG("Register string '%s'", entry);
-
- tok = strchr(entrycpy, ':');
- xbt_assert(tok, "Invalid config element descriptor: %s; Should be <name>:<type>", entry);
- *(tok++) = '\0';
-
- for (type = (e_xbt_cfgelm_type_t)0; type < xbt_cfgelm_type_count && strcmp(tok, xbt_cfgelm_type_name[type]); type++);
- xbt_assert(type < xbt_cfgelm_type_count,
- "Invalid type in config element descriptor: %s; Should be one of 'string', 'int' or 'double'.", entry);
-
- xbt_cfg_register(cfg, entrycpy, NULL, type, NULL, NULL, NULL, NULL);
-
- free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
-}
-
-/** @brief Displays the declared aliases and their description */
-void xbt_cfg_aliases(void)
-{
- 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);
-
- xbt_dict_foreach((xbt_dict_t )simgrid_config, dict_cursor, name, variable)
- xbt_dynar_push(names, &name);
- xbt_dynar_sort_strings(names);
-
- xbt_dynar_foreach(names, dynar_cursor, name) {
- variable = xbt_dict_get((xbt_dict_t )simgrid_config, name);
-
- if (variable->type == xbt_cfgelm_alias)
- printf(" %s: %s\n", name, variable->desc);
- }
-}
-
-/** @brief Displays the declared options and their description */
-void xbt_cfg_help(void)
-{
- 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);
-
- xbt_dict_foreach((xbt_dict_t )simgrid_config, dict_cursor, name, variable)
- xbt_dynar_push(names, &name);
- xbt_dynar_sort_strings(names);
-
- xbt_dynar_foreach(names, dynar_cursor, name) {
- int size;
- variable = xbt_dict_get((xbt_dict_t )simgrid_config, name);
- if (variable->type == xbt_cfgelm_alias)
- continue;
-
- printf(" %s: %s\n", name, variable->desc);
- printf(" Type: %s; ", xbt_cfgelm_type_name[variable->type]);
- size = xbt_dynar_length(variable->content);
- printf("Current value: ");
-
- if (size != 1)
- printf(size == 0 ? "n/a\n" : "{ ");
- for (int i = 0; i < size; i++) {
- const char *sep = (size == 1 ? "\n" : (i < size - 1 ? ", " : " }\n"));
-
- switch (variable->type) {
- case xbt_cfgelm_int:
- printf("%d%s", xbt_dynar_get_as(variable->content, i, int), sep);
- break;
- case xbt_cfgelm_double:
- printf("%f%s", xbt_dynar_get_as(variable->content, i, double), sep);
- break;
- case xbt_cfgelm_string:
- printf("'%s'%s", xbt_dynar_get_as(variable->content, i, char *), sep);
- break;
- case xbt_cfgelm_boolean: {
- int b = xbt_dynar_get_as(variable->content, i, int);
- const char *bs = b ? xbt_cfgelm_boolean_values[0].true_val: xbt_cfgelm_boolean_values[0].false_val;
- if (b == 0 || b == 1)
- printf("'%s'%s", bs, sep);
- else
- printf("'%s/%d'%s", bs, b, sep);
- break;
- }
- default:
- printf("Invalid type!!%s", sep);
- break;
- }
- }
- }
- xbt_dynar_free(&names);
-}
-
-static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm_type_t type)
-{
- xbt_cfgelm_t res = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
-
- // The user used the old name. Switch to the new one after a short warning
- while (res && res->type == xbt_cfgelm_alias) {
- const char* newname = (const char *)res->content;
- XBT_INFO("Option %s has been renamed to %s. Consider switching.", name, newname);
- res = xbt_cfgelm_get(cfg, newname, type);
- }
-
- if (!res) {
- xbt_cfg_help();
- fflush(stdout);
- THROWF(not_found_error, 0, "No registered variable '%s' in this config set.", name);
- }
-
- 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]);
- return res;
-}
-
-/** @brief Get the type of this variable in that configuration set
- *
- * @param cfg the config set
- * @param name the name of the element
- *
- * @return the type of the given element
- */
-e_xbt_cfgelm_type_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name)
-{
- xbt_cfgelm_t variable = NULL;
-
- variable = xbt_dict_get_or_null((xbt_dict_t) cfg, name);
- if (!variable)
- THROWF(not_found_error, 0, "Can't get the type of '%s' since this variable does not exist", name);
-
- XBT_DEBUG("type in variable = %d", (int)variable->type);
- return variable->type;
-}
-
-/*----[ Setting ]---------------------------------------------------------*/
-/** @brief va_args version of xbt_cfg_set
- *
- * @param cfg config set to fill
- * @param name variable name
- * @param pa variable value
- *
- * Add some values to the config set.
- */
-void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
-{
- char *str;
- int i;
- double d;
- e_xbt_cfgelm_type_t type = xbt_cfgelm_type_count; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
-
- xbt_ex_t e;
-
- TRY {
- type = xbt_cfg_get_type(cfg, name);
- }
- CATCH(e) {
- if (e.category == not_found_error) {
- xbt_ex_free(e);
- THROWF(not_found_error, 0, "Can't set the property '%s' since it's not registered", name);
- }
- RETHROW;
- }
-
- switch (type) {
- case xbt_cfgelm_string:
- str = va_arg(pa, char *);
- xbt_cfg_set_string(name, str);
- break;
- case xbt_cfgelm_int:
- i = va_arg(pa, int);
- xbt_cfg_set_int(name, i);
- break;
- case xbt_cfgelm_double:
- d = va_arg(pa, double);
- xbt_cfg_set_double(name, d);
- break;
- case xbt_cfgelm_boolean:
- str = va_arg(pa, char *);
- xbt_cfg_set_boolean(name, str);
- break;
- default:
- xbt_die("Config element variable %s not valid (type=%d)", name, (int)type);
- }
-}
-
-/** @brief Add a NULL-terminated list of pairs {(char*)key, value} to the set
- *
- * @param cfg config set to fill
- * @param name variable name
- * @param ... variable value
- */
-void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...)
-{
- va_list pa;
-
- va_start(pa, name);
- xbt_cfg_set_vargs(cfg, name, pa);
- va_end(pa);
-}
-
-/** @brief Add values parsed from a string into a config set
- *
- * @param options a string containing the content to add to the config set. This is a '\\t',' ' or '\\n' or ','
- * separated list of variables. Each individual variable is like "[name]:[value]" where [name] is the name of an
- * already registered variable, and [value] conforms to the data type under which this variable was registered.
- *
- * @todo This is a crude manual parser, it should be a proper lexer.
- */
-void xbt_cfg_set_parse(const char *options)
-{
- if (!options || !strlen(options)) { /* nothing to do */
- return;
- }
- char *optionlist_cpy = xbt_strdup(options);
-
- XBT_DEBUG("List to parse and set:'%s'", options);
- char *option = optionlist_cpy;
- while (1) { /* breaks in the code */
- if (!option)
- break;
- char *name = option;
- int len = strlen(name);
- 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 != ',') {
- XBT_DEBUG("Take %c.", *option);
- option++;
- }
- if (option - name == len) {
- XBT_DEBUG("Boundary=EOL");
- option = NULL; /* don't do next iteration */
- } else {
- XBT_DEBUG("Boundary on '%c'. len=%d;option-name=%ld", *option, len, (long) (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"); */
- option++;
- }
- if (option - name == len - 1)
- option = NULL; /* don't do next iteration */
- }
- XBT_DEBUG("parse now:'%s'; parse later:'%s'", name, option);
-
- if (name[0] == ' ' || name[0] == '\n' || name[0] == '\t')
- continue;
- if (!strlen(name))
- break;
-
- char *val = strchr(name, ':');
- xbt_assert(val, "Option '%s' badly formatted. Should be of the form 'name:value'", name);
- /* don't free(optionlist_cpy) if the assert fails, 'name' points inside it */
- *(val++) = '\0';
-
- if (strncmp(name, "contexts/", strlen("contexts/")) && strncmp(name, "path", strlen("path")))
- XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
-
- TRY {
- xbt_cfg_set_as_string(name,val);
- } CATCH_ANONYMOUS {
- free(optionlist_cpy);
- RETHROW;
- }
- }
- free(optionlist_cpy);
-}
-
-/** @brief Set the value of a variable, using the string representation of that value
- *
- * @param key name of the variable to modify
- * @param value string representation of the value to set
- *
- * @return the first char after the parsed value in val
- */
-
-void *xbt_cfg_set_as_string(const char *key, const char *value) {
- xbt_ex_t e;
-
- char *ret;
- volatile xbt_cfgelm_t variable = NULL;
- int i;
- double d;
-
- TRY {
- while (variable == NULL) {
- variable = xbt_dict_get((xbt_dict_t) simgrid_config, key);
- if (variable->type == xbt_cfgelm_alias) {
- const char *newname = (const char*)variable->content;
- XBT_INFO("Note: configuration '%s' is deprecated. Please use '%s' instead.", key, newname);
- key = newname;
- variable = NULL;
- }
- }
- } CATCH(e) {
- if (e.category == not_found_error) {
- xbt_ex_free(e);
- THROWF(not_found_error, 0, "No registered variable corresponding to '%s'.", key);
- }
- RETHROW;
- }
-
- switch (variable->type) {
- case xbt_cfgelm_string:
- xbt_cfg_set_string(key, value); /* throws */
- break;
- case xbt_cfgelm_int:
- i = strtol(value, &ret, 0);
- if (ret == value) {
- xbt_die("Value of option %s not valid. Should be an integer", key);
- }
- xbt_cfg_set_int(key, i); /* throws */
- break;
- case xbt_cfgelm_double:
- d = strtod(value, &ret);
- if (ret == value) {
- xbt_die("Value of option %s not valid. Should be a double", key);
- }
- xbt_cfg_set_double(key, d); /* throws */
- break;
- case xbt_cfgelm_boolean:
- xbt_cfg_set_boolean(key, value); /* throws */
- ret = (char *)value + strlen(value);
- break;
- default:
- THROWF(unknown_error, 0, "Type of config element %s is not valid.", key);
- break;
- }
- return ret;
-}
-
-/** @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(const char *name, int val)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
-
- if (variable->isdefault){
- xbt_cfg_set_int(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(const char *name, double val)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
-
- if (variable->isdefault) {
- xbt_cfg_set_double(name, val);
- variable->isdefault = 1;
- } else
- XBT_DEBUG("Do not override configuration variable '%s' with value '%f' 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(const char *name, const char *val)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
-
- if (variable->isdefault){
- xbt_cfg_set_string(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 an boolean 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_boolean(const char *name, const char *val)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
-
- if (variable->isdefault){
- xbt_cfg_set_boolean(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 an integer value to \a name within \a cfg
- *
- * @param name the name of the variable
- * @param val the value of the variable
- */
-void xbt_cfg_set_int(const char *name, int val)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
-
- xbt_dynar_set(variable->content, 0, &val);
-
- if (variable->cb_set)
- variable->cb_set(name);
- if (variable->cb_set_ext)
- variable->cb_set_ext(name, variable->cb_set_data);
- variable->isdefault = 0;
-}
-
-/** @brief Set or add a double value to \a name within \a cfg
- *
- * @param name the name of the variable
- * @param val the double to set
- */
-void xbt_cfg_set_double(const char *name, double val)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
-
- xbt_dynar_set(variable->content, 0, &val);
-
- if (variable->cb_set)
- variable->cb_set(name);
- if (variable->cb_set_ext)
- variable->cb_set_ext(name, variable->cb_set_data);
- variable->isdefault = 0;
-}
-
-/** @brief Set or add a string value to \a name within \a cfg
- *
- * @param cfg the config set
- * @param name the name of the variable
- * @param val the value to be added
- *
- */
-void xbt_cfg_set_string(const char *name, const char *val)
-{
- char *newval = xbt_strdup(val);
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
-
- if (!xbt_dynar_is_empty(variable->content)) {
- char *sval = xbt_dynar_get_as(variable->content, 0, char *);
- free(sval);
- }
-
- xbt_dynar_set(variable->content, 0, &newval);
-
- if (variable->cb_set)
- variable->cb_set(name);
- if (variable->cb_set_ext)
- variable->cb_set_ext(name, variable->cb_set_data);
- variable->isdefault = 0;
-}
-
-/** @brief Set or add a boolean value to \a name within \a cfg
- *
- * @param name the name of the variable
- * @param val the value of the variable
- */
-void xbt_cfg_set_boolean(const char *name, const char *val)
-{
- int bval=-1;
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
-
- for (int i = 0; xbt_cfgelm_boolean_values[i].true_val != NULL; i++) {
- if (strcmp(val, xbt_cfgelm_boolean_values[i].true_val) == 0){
- bval = 1;
- break;
- }
- if (strcmp(val, xbt_cfgelm_boolean_values[i].false_val) == 0){
- bval = 0;
- break;
- }
- }
- xbt_assert(bval != -1, "Value of option '%s' not valid. Should be a boolean (yes,no,on,off,true,false,0,1)", val);
- xbt_dynar_set(variable->content, 0, &bval);
-
- if (variable->cb_set)
- variable->cb_set(name);
- if (variable->cb_set_ext)
- variable->cb_set_ext(name, variable->cb_set_data);
- variable->isdefault = 0;
-}
-
-
-/* Say if the value is the default value */
-int xbt_cfg_is_default_value(const char *name)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_any);
- return variable->isdefault;
-}
-
-/*----[ Getting ]---------------------------------------------------------*/
-/** @brief Retrieve an integer value of a variable (get a warning if not uniq)
- *
- * @param name the name of the variable
- *
- * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
- */
-int xbt_cfg_get_int(const char *name)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
-
- if (xbt_dynar_length(variable->content) > 1) {
- 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);
-}
-
-/** @brief Retrieve a double value of a variable (get a warning if not uniq)
- *
- * @param cfg the config set
- * @param name the name of the variable
- *
- * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
- */
-double xbt_cfg_get_double(const char *name)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
-
- if (xbt_dynar_length(variable->content) > 1) {
- 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);
-}
-
-/** @brief Retrieve a string value of a variable (get a warning if not uniq)
- *
- * @param cfg the config set
- * @param name the name of the variable
- *
- * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using
- * xbt_cfg_get_dynar() instead. Returns NULL if there is no value.
- *
- * \warning the returned value is the actual content of the config set
- */
-char *xbt_cfg_get_string(const char *name)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
-
- if (xbt_dynar_length(variable->content) > 1) {
- 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_is_empty(variable->content)) {
- return NULL;
- }
-
- return xbt_dynar_get_as(variable->content, 0, char *);
-}
-
-/** @brief Retrieve a boolean value of a variable (get a warning if not uniq)
- *
- * @param cfg the config set
- * @param name the name of the variable
- *
- * Returns the first value from the config set under the given name.
- * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
- */
-int xbt_cfg_get_boolean(const char *name)
-{
- xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
-
- if (xbt_dynar_length(variable->content) > 1) {
- 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);
-}
-
-#ifdef SIMGRID_TEST
-#include "xbt.h"
-#include "xbt/ex.h"
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg);
-
-XBT_TEST_SUITE("config", "Configuration support");
-
-static xbt_cfg_t make_set()
-{
- xbt_cfg_t set = NULL;
-
- xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
- xbt_cfg_register_str(&set, "speed:int");
- xbt_cfg_register_str(&set, "peername:string");
- xbt_cfg_register_str(&set, "user:string");
-
- return set;
-} /* end_of_make_set */
-
-XBT_PUBLIC_DATA(xbt_cfg_t) simgrid_config;
-
-XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
-{
- simgrid_config = make_set();
- xbt_test_add("Alloc and free a config set");
- xbt_cfg_set_parse("peername:veloce user:bidule");
- xbt_cfg_free(&simgrid_config);
-}
-
-XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
-{
- simgrid_config = make_set();
- xbt_test_add("Get a single value");
- {
- /* get_single_value */
- int ival;
-
- xbt_cfg_set_parse("peername:toto:42 speed:42");
- ival = xbt_cfg_get_int("speed");
- if (ival != 42)
- xbt_test_fail("Speed value = %d, I expected 42", ival);
- }
-
- xbt_test_add("Access to a non-existant entry");
- {
- xbt_ex_t e;
-
- TRY {
- xbt_cfg_set_parse("color:blue");
- } CATCH(e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- xbt_ex_free(e);
- }
- }
- xbt_cfg_free(&simgrid_config);
-}
-#endif /* SIMGRID_TEST */
-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2004-2014,2016. 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. */
+#include <stdio.h>
+#include <cerrno>
+#include <cstring>
+#include <climits>
#include <functional>
+#include <stdexcept>
#include <string>
+#include <type_traits>
#include <xbt/config.h>
#include <xbt/config.hpp>
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/ex.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+
+// *****
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
+
+XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = NULL;
+
+namespace {
+
+static inline
+void increment(e_xbt_cfgelm_type_t& type)
+{
+ typedef std::underlying_type<e_xbt_cfgelm_type_t>::type underlying_type;
+ type = (e_xbt_cfgelm_type_t) ((underlying_type) type + 1);
+}
+
+}
+
+/* xbt_cfgelm_t: the typedef corresponding to a config variable. */
+
+typedef struct s_xbt_cfgelm_t {
+ /* Description */
+ std::string desc;
+
+ /* Allowed type of the variable */
+ e_xbt_cfgelm_type_t type;
+ bool isdefault = true;
+
+ /* Callback */
+ xbt_cfg_cb_t cb_set = nullptr;
+
+ /* Advanced callback (for xbt_cfgelm_string only) */
+ std::function<void(const char* value)> callback;
+
+ /* actual content (could be an union or something) */
+ xbt_dynar_t content = nullptr;
+
+ ~s_xbt_cfgelm_t()
+ {
+ XBT_DEBUG("Frees cfgelm %p", this);
+ if (this->type != xbt_cfgelm_alias)
+ xbt_dynar_free(&(this->content));
+ }
+
+} s_xbt_cfgelm_t, *xbt_cfgelm_t;
+
+static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] = { "int", "double", "string", "boolean", "any", "outofbound" };
+
+const struct xbt_boolean_couple xbt_cfgelm_boolean_values[] = {
+ { "yes", "no"},
+ { "on", "off"},
+ {"true", "false"},
+ { "1", "0"},
+ { NULL, NULL}
+};
+
+/* Internal stuff used in cache to free a variable */
+static void xbt_cfgelm_free(void *data)
+{
+ if (data)
+ delete (xbt_cfgelm_t) data;
+}
+
+/* Retrieve the variable we'll modify */
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm_type_t type);
+
+/*----[ Memory management ]-----------------------------------------------*/
+/** @brief Constructor
+ *
+ * Initialise a config set
+ */
+xbt_cfg_t xbt_cfg_new(void)
+{
+ return (xbt_cfg_t) xbt_dict_new_homogeneous(&xbt_cfgelm_free);
+}
+
+/** @brief Destructor */
+void xbt_cfg_free(xbt_cfg_t * cfg)
+{
+ XBT_DEBUG("Frees cfg set %p", cfg);
+ xbt_dict_free((xbt_dict_t *) cfg);
+}
+
+/** @brief Dump a config set for debuging purpose
+ *
+ * @param name The name to give to this config set
+ * @param indent what to write at the beginning of each line (right number of spaces)
+ * @param cfg the config set
+ */
+void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
+{
+ xbt_dict_t dict = (xbt_dict_t) cfg;
+ xbt_dict_cursor_t cursor = NULL;
+ xbt_cfgelm_t variable = NULL;
+ char *key = NULL;
+ int i;
+ int size;
+ int ival;
+ char *sval;
+ double dval;
+
+ if (name)
+ printf("%s>> Dumping of the config set '%s':\n", indent, name);
+
+ xbt_dict_foreach(dict, cursor, key, variable) {
+ printf("%s %s:", indent, key);
+
+ size = xbt_dynar_length(variable->content);
+ printf ("%s. Actual size=%d. postset=%p\n",
+ xbt_cfgelm_type_name[variable->type], size, variable->cb_set);
+
+ switch (variable->type) {
+ case xbt_cfgelm_int:
+ for (i = 0; i < size; i++) {
+ ival = xbt_dynar_get_as(variable->content, i, int);
+ printf("%s %d\n", indent, ival);
+ }
+ break;
+ case xbt_cfgelm_double:
+ for (i = 0; i < size; i++) {
+ dval = xbt_dynar_get_as(variable->content, i, double);
+ printf("%s %f\n", indent, dval);
+ }
+ break;
+ case xbt_cfgelm_string:
+ for (i = 0; i < size; i++) {
+ sval = xbt_dynar_get_as(variable->content, i, char *);
+ printf("%s %s\n", indent, sval);
+ }
+ break;
+ case xbt_cfgelm_boolean:
+ for (i = 0; i < size; i++) {
+ ival = xbt_dynar_get_as(variable->content, i, int);
+ printf("%s %d\n", indent, ival);
+ }
+ break;
+ case xbt_cfgelm_alias:
+ /* no content */
+ break;
+ default:
+ printf("%s Invalid type!!\n", indent);
+ break;
+ }
+ }
+
+ if (name)
+ printf("%s<< End of the config set '%s'\n", indent, name);
+ fflush(stdout);
+
+ xbt_dict_cursor_free(&cursor);
+}
+
+/*----[ Registering stuff ]-----------------------------------------------*/
+/** @brief Register an element within a config set
+ *
+ * @param cfg the config set
+ * @param name the name of the config element
+ * @param desc a description for this item (used by xbt_cfg_help())
+ * @param type the type of the config element
+ * @param cb_set callback function called when a value is set
+ */
+static void xbt_cfg_register(
+ xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt_cfgelm_type_t type,
+ xbt_cfg_cb_t cb_set,
+ std::function<void(const char* value)> callback = std::function<void(const char* value)>())
+{
+ if (*cfg == NULL)
+ *cfg = xbt_cfg_new();
+ xbt_assert(type >= xbt_cfgelm_int && type <= xbt_cfgelm_boolean,
+ "type of %s not valid (%d should be between %d and %d)",
+ name, (int)type, xbt_cfgelm_int, xbt_cfgelm_boolean);
+
+ xbt_cfgelm_t res = (xbt_cfgelm_t) xbt_dict_get_or_null((xbt_dict_t) * cfg, name);
+ xbt_assert(NULL == res, "Refusing to register the config element '%s' twice.", name);
+
+ res = new s_xbt_cfgelm_t();
+ XBT_DEBUG("Register cfg elm %s (%s) (%s (=%d) @%p in set %p)",
+ name, desc, xbt_cfgelm_type_name[type], (int)type, res, *cfg);
+ res->type = type;
+ if (desc)
+ res->desc = desc;
+ res->cb_set = cb_set;
+ res->callback = std::move(callback);
+
+ switch (type) {
+ case xbt_cfgelm_int:
+ res->content = xbt_dynar_new(sizeof(int), NULL);
+ break;
+ case xbt_cfgelm_double:
+ res->content = xbt_dynar_new(sizeof(double), NULL);
+ break;
+ case xbt_cfgelm_string:
+ res->content = xbt_dynar_new(sizeof(char *), xbt_free_ref);
+ break;
+ case xbt_cfgelm_boolean:
+ res->content = xbt_dynar_new(sizeof(int), NULL);
+ break;
+ default:
+ XBT_ERROR("%d is an invalid type code", (int)type);
+ break;
+ }
+
+ xbt_dict_set((xbt_dict_t) * cfg, name, res, NULL);
+}
+
+void xbt_cfg_register_double(const char *name, double default_value,xbt_cfg_cb_t cb_set, const char *desc){
+ xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_double,cb_set);
+ xbt_cfg_setdefault_double(name, default_value);
+}
+void xbt_cfg_register_int(const char *name, int default_value,xbt_cfg_cb_t cb_set, const char *desc) {
+ xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_int,cb_set);
+ xbt_cfg_setdefault_int(name, default_value);
+}
+void xbt_cfg_register_string(const char *name, const char *default_value, xbt_cfg_cb_t cb_set, const char *desc){
+ xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_string,cb_set);
+ xbt_cfg_setdefault_string(name, default_value);
+}
+void xbt_cfg_register_boolean(const char *name, const char*default_value,xbt_cfg_cb_t cb_set, const char *desc){
+ xbt_cfg_register(&simgrid_config,name,desc,xbt_cfgelm_boolean,cb_set);
+ xbt_cfg_setdefault_boolean(name, default_value);
+}
+
+void xbt_cfg_register_alias(const char *newname, const char *oldname)
+{
+ if (simgrid_config == NULL)
+ simgrid_config = xbt_cfg_new();
+
+ xbt_cfgelm_t res = (xbt_cfgelm_t) xbt_dict_get_or_null((xbt_dict_t) simgrid_config, oldname);
+ xbt_assert(NULL == res, "Refusing to register the option '%s' twice.", oldname);
+
+ res = (xbt_cfgelm_t) xbt_dict_get_or_null((xbt_dict_t) simgrid_config, newname);
+ xbt_assert(res, "Cannot define an alias to the non-existing option '%s'.", newname);
+
+ res = new s_xbt_cfgelm_t();
+ XBT_DEBUG("Register cfg alias %s -> %s)",oldname,newname);
+
+ res->desc = bprintf("Deprecated alias for %s",newname);
+ res->type = xbt_cfgelm_alias;
+ res->content = (xbt_dynar_t)newname;
+
+ xbt_dict_set((xbt_dict_t) simgrid_config, oldname, res, NULL);
+}
+
+/**
+ * @brief Parse a string and register the stuff described.
+ *
+ * @param cfg the config set
+ * @param entry a string describing the element to register
+ *
+ * The string may consist in several variable descriptions separated by a space.
+ * Each of them must use the following syntax: \<name\>:\<type\>
+ * with type being one of 'string','int','bool' or 'double'.
+ *
+ * Note that this does not allow to set the description, so you should prefer the other interface
+ */
+void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
+{
+ char *entrycpy = xbt_strdup(entry);
+ char *tok;
+
+ e_xbt_cfgelm_type_t type;
+ XBT_DEBUG("Register string '%s'", entry);
+
+ tok = strchr(entrycpy, ':');
+ xbt_assert(tok, "Invalid config element descriptor: %s; Should be <name>:<type>", entry);
+ *(tok++) = '\0';
+
+ for (type = (e_xbt_cfgelm_type_t)0; type < xbt_cfgelm_type_count && strcmp(tok, xbt_cfgelm_type_name[type]); increment(type));
+ xbt_assert(type < xbt_cfgelm_type_count,
+ "Invalid type in config element descriptor: %s; Should be one of 'string', 'int' or 'double'.", entry);
+
+ xbt_cfg_register(cfg, entrycpy, NULL, type, NULL);
+
+ free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
+}
+
+/** @brief Displays the declared aliases and their description */
+void xbt_cfg_aliases(void)
+{
+ 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);
+
+ xbt_dict_foreach((xbt_dict_t )simgrid_config, dict_cursor, name, variable)
+ xbt_dynar_push(names, &name);
+ xbt_dynar_sort_strings(names);
+
+ xbt_dynar_foreach(names, dynar_cursor, name) {
+ variable = (xbt_cfgelm_t) xbt_dict_get((xbt_dict_t )simgrid_config, name);
+
+ if (variable->type == xbt_cfgelm_alias)
+ printf(" %s: %s\n", name, variable->desc.c_str());
+ }
+}
+
+/** @brief Displays the declared options and their description */
+void xbt_cfg_help(void)
+{
+ 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);
+
+ xbt_dict_foreach((xbt_dict_t )simgrid_config, dict_cursor, name, variable)
+ xbt_dynar_push(names, &name);
+ xbt_dynar_sort_strings(names);
+
+ xbt_dynar_foreach(names, dynar_cursor, name) {
+ int size;
+ variable = (xbt_cfgelm_t) xbt_dict_get((xbt_dict_t )simgrid_config, name);
+ if (variable->type == xbt_cfgelm_alias)
+ continue;
+
+ printf(" %s: %s\n", name, variable->desc.c_str());
+ printf(" Type: %s; ", xbt_cfgelm_type_name[variable->type]);
+ size = xbt_dynar_length(variable->content);
+ printf("Current value: ");
+
+ if (size != 1)
+ printf(size == 0 ? "n/a\n" : "{ ");
+ for (int i = 0; i < size; i++) {
+ const char *sep = (size == 1 ? "\n" : (i < size - 1 ? ", " : " }\n"));
+
+ switch (variable->type) {
+ case xbt_cfgelm_int:
+ printf("%d%s", xbt_dynar_get_as(variable->content, i, int), sep);
+ break;
+ case xbt_cfgelm_double:
+ printf("%f%s", xbt_dynar_get_as(variable->content, i, double), sep);
+ break;
+ case xbt_cfgelm_string:
+ printf("'%s'%s", xbt_dynar_get_as(variable->content, i, char *), sep);
+ break;
+ case xbt_cfgelm_boolean: {
+ int b = xbt_dynar_get_as(variable->content, i, int);
+ const char *bs = b ? xbt_cfgelm_boolean_values[0].true_val: xbt_cfgelm_boolean_values[0].false_val;
+ if (b == 0 || b == 1)
+ printf("'%s'%s", bs, sep);
+ else
+ printf("'%s/%d'%s", bs, b, sep);
+ break;
+ }
+ default:
+ printf("Invalid type!!%s", sep);
+ break;
+ }
+ }
+ }
+ xbt_dynar_free(&names);
+}
+
+static xbt_cfgelm_t xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, e_xbt_cfgelm_type_t type)
+{
+ xbt_cfgelm_t res = (xbt_cfgelm_t) xbt_dict_get_or_null((xbt_dict_t) cfg, name);
+
+ // The user used the old name. Switch to the new one after a short warning
+ while (res && res->type == xbt_cfgelm_alias) {
+ const char* newname = (const char *)res->content;
+ XBT_INFO("Option %s has been renamed to %s. Consider switching.", name, newname);
+ res = xbt_cfgelm_get(cfg, newname, type);
+ }
+
+ if (!res) {
+ xbt_cfg_help();
+ fflush(stdout);
+ THROWF(not_found_error, 0, "No registered variable '%s' in this config set.", name);
+ }
+
+ 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]);
+ return res;
+}
+
+/** @brief Get the type of this variable in that configuration set
+ *
+ * @param cfg the config set
+ * @param name the name of the element
+ *
+ * @return the type of the given element
+ */
+e_xbt_cfgelm_type_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name)
+{
+ xbt_cfgelm_t variable = NULL;
+
+ variable = (xbt_cfgelm_t) xbt_dict_get_or_null((xbt_dict_t) cfg, name);
+ if (!variable)
+ THROWF(not_found_error, 0, "Can't get the type of '%s' since this variable does not exist", name);
+
+ XBT_DEBUG("type in variable = %d", (int)variable->type);
+ return variable->type;
+}
+
+/*----[ Setting ]---------------------------------------------------------*/
+/** @brief va_args version of xbt_cfg_set
+ *
+ * @param cfg config set to fill
+ * @param name variable name
+ * @param pa variable value
+ *
+ * Add some values to the config set.
+ */
+void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa)
+{
+ char *str;
+ int i;
+ double d;
+ e_xbt_cfgelm_type_t type = xbt_cfgelm_type_count; /* Set a dummy value to make gcc happy. It cannot get uninitialized */
+
+ xbt_ex_t e;
+
+ TRY {
+ type = xbt_cfg_get_type(cfg, name);
+ }
+ CATCH(e) {
+ if (e.category == not_found_error) {
+ xbt_ex_free(e);
+ THROWF(not_found_error, 0, "Can't set the property '%s' since it's not registered", name);
+ }
+ RETHROW;
+ }
+
+ switch (type) {
+ case xbt_cfgelm_string:
+ str = va_arg(pa, char *);
+ xbt_cfg_set_string(name, str);
+ break;
+ case xbt_cfgelm_int:
+ i = va_arg(pa, int);
+ xbt_cfg_set_int(name, i);
+ break;
+ case xbt_cfgelm_double:
+ d = va_arg(pa, double);
+ xbt_cfg_set_double(name, d);
+ break;
+ case xbt_cfgelm_boolean:
+ str = va_arg(pa, char *);
+ xbt_cfg_set_boolean(name, str);
+ break;
+ default:
+ xbt_die("Config element variable %s not valid (type=%d)", name, (int)type);
+ }
+}
+
+/** @brief Add a NULL-terminated list of pairs {(char*)key, value} to the set
+ *
+ * @param cfg config set to fill
+ * @param name variable name
+ * @param ... variable value
+ */
+void xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...)
+{
+ va_list pa;
+
+ va_start(pa, name);
+ xbt_cfg_set_vargs(cfg, name, pa);
+ va_end(pa);
+}
+
+/** @brief Add values parsed from a string into a config set
+ *
+ * @param options a string containing the content to add to the config set. This is a '\\t',' ' or '\\n' or ','
+ * separated list of variables. Each individual variable is like "[name]:[value]" where [name] is the name of an
+ * already registered variable, and [value] conforms to the data type under which this variable was registered.
+ *
+ * @todo This is a crude manual parser, it should be a proper lexer.
+ */
+void xbt_cfg_set_parse(const char *options)
+{
+ if (!options || !strlen(options)) { /* nothing to do */
+ return;
+ }
+ char *optionlist_cpy = xbt_strdup(options);
+
+ XBT_DEBUG("List to parse and set:'%s'", options);
+ char *option = optionlist_cpy;
+ while (1) { /* breaks in the code */
+ if (!option)
+ break;
+ char *name = option;
+ int len = strlen(name);
+ 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 != ',') {
+ XBT_DEBUG("Take %c.", *option);
+ option++;
+ }
+ if (option - name == len) {
+ XBT_DEBUG("Boundary=EOL");
+ option = NULL; /* don't do next iteration */
+ } else {
+ XBT_DEBUG("Boundary on '%c'. len=%d;option-name=%ld", *option, len, (long) (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"); */
+ option++;
+ }
+ if (option - name == len - 1)
+ option = NULL; /* don't do next iteration */
+ }
+ XBT_DEBUG("parse now:'%s'; parse later:'%s'", name, option);
+
+ if (name[0] == ' ' || name[0] == '\n' || name[0] == '\t')
+ continue;
+ if (!strlen(name))
+ break;
+
+ char *val = strchr(name, ':');
+ xbt_assert(val, "Option '%s' badly formatted. Should be of the form 'name:value'", name);
+ /* don't free(optionlist_cpy) if the assert fails, 'name' points inside it */
+ *(val++) = '\0';
+
+ if (strncmp(name, "contexts/", strlen("contexts/")) && strncmp(name, "path", strlen("path")))
+ XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
+
+ TRY {
+ xbt_cfg_set_as_string(name,val);
+ } CATCH_ANONYMOUS {
+ free(optionlist_cpy);
+ RETHROW;
+ }
+ }
+ free(optionlist_cpy);
+}
+
+/** @brief Set the value of a variable, using the string representation of that value
+ *
+ * @param key name of the variable to modify
+ * @param value string representation of the value to set
+ *
+ * @return the first char after the parsed value in val
+ */
+
+void *xbt_cfg_set_as_string(const char *key, const char *value) {
+ xbt_ex_t e;
+
+ char *ret;
+ volatile xbt_cfgelm_t variable = NULL;
+ int i;
+ double d;
+
+ TRY {
+ while (variable == NULL) {
+ variable = (xbt_cfgelm_t) xbt_dict_get((xbt_dict_t) simgrid_config, key);
+ if (variable->type == xbt_cfgelm_alias) {
+ const char *newname = (const char*)variable->content;
+ XBT_INFO("Note: configuration '%s' is deprecated. Please use '%s' instead.", key, newname);
+ key = newname;
+ variable = NULL;
+ }
+ }
+ } CATCH(e) {
+ if (e.category == not_found_error) {
+ xbt_ex_free(e);
+ THROWF(not_found_error, 0, "No registered variable corresponding to '%s'.", key);
+ }
+ RETHROW;
+ }
+
+ switch (variable->type) {
+ case xbt_cfgelm_string:
+ xbt_cfg_set_string(key, value); /* throws */
+ break;
+ case xbt_cfgelm_int:
+ i = strtol(value, &ret, 0);
+ if (ret == value) {
+ xbt_die("Value of option %s not valid. Should be an integer", key);
+ }
+ xbt_cfg_set_int(key, i); /* throws */
+ break;
+ case xbt_cfgelm_double:
+ d = strtod(value, &ret);
+ if (ret == value) {
+ xbt_die("Value of option %s not valid. Should be a double", key);
+ }
+ xbt_cfg_set_double(key, d); /* throws */
+ break;
+ case xbt_cfgelm_boolean:
+ xbt_cfg_set_boolean(key, value); /* throws */
+ ret = (char *)value + strlen(value);
+ break;
+ default:
+ THROWF(unknown_error, 0, "Type of config element %s is not valid.", key);
+ break;
+ }
+ return ret;
+}
+
+/** @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(const char *name, int val)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
+
+ if (variable->isdefault){
+ xbt_cfg_set_int(name, val);
+ variable->isdefault = true;
+ } 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(const char *name, double val)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
+
+ if (variable->isdefault) {
+ xbt_cfg_set_double(name, val);
+ variable->isdefault = true;
+ } else
+ XBT_DEBUG("Do not override configuration variable '%s' with value '%f' 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(const char *name, const char *val)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
+
+ if (variable->isdefault){
+ xbt_cfg_set_string(name, val);
+ variable->isdefault = true;
+ } else
+ XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.", name, val);
+}
+
+/** @brief Set an boolean 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_boolean(const char *name, const char *val)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
+
+ if (variable->isdefault){
+ xbt_cfg_set_boolean(name, val);
+ variable->isdefault = true;
+ }
+ else
+ XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.", name, val);
+}
+
+/** @brief Set an integer value to \a name within \a cfg
+ *
+ * @param name the name of the variable
+ * @param val the value of the variable
+ */
+void xbt_cfg_set_int(const char *name, int val)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
+
+ xbt_dynar_set(variable->content, 0, &val);
+
+ if (variable->cb_set)
+ variable->cb_set(name);
+ variable->isdefault = false;
+}
+
+/** @brief Set or add a double value to \a name within \a cfg
+ *
+ * @param name the name of the variable
+ * @param val the double to set
+ */
+void xbt_cfg_set_double(const char *name, double val)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
+
+ xbt_dynar_set(variable->content, 0, &val);
+
+ if (variable->cb_set)
+ variable->cb_set(name);
+ variable->isdefault = false;
+}
+
+/** @brief Set or add a string value to \a name within \a cfg
+ *
+ * @param cfg the config set
+ * @param name the name of the variable
+ * @param val the value to be added
+ *
+ */
+void xbt_cfg_set_string(const char *name, const char *val)
+{
+ char *newval = xbt_strdup(val);
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
+
+ if (!xbt_dynar_is_empty(variable->content)) {
+ char *sval = xbt_dynar_get_as(variable->content, 0, char *);
+ free(sval);
+ }
+
+ xbt_dynar_set(variable->content, 0, &newval);
+
+ if (variable->cb_set)
+ variable->cb_set(name);
+
+ if (variable->callback) {
+ try {
+ variable->callback(val);
+ }
+ catch(std::range_error& e) {
+ xbt_die("Invalid flag %s=%s: %s", val, name, e.what());
+ }
+ catch(std::exception& e) {
+ xbt_die("Error for flag %s=%s: %s", val, name, e.what());
+ }
+ catch(...) {
+ xbt_die("Error for flag %s=%s", val, name);
+ }
+ }
+
+ variable->isdefault = false;
+}
+
+/** @brief Set or add a boolean value to \a name within \a cfg
+ *
+ * @param name the name of the variable
+ * @param val the value of the variable
+ */
+void xbt_cfg_set_boolean(const char *name, const char *val)
+{
+ int bval=-1;
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
+
+ for (int i = 0; xbt_cfgelm_boolean_values[i].true_val != NULL; i++) {
+ if (strcmp(val, xbt_cfgelm_boolean_values[i].true_val) == 0){
+ bval = 1;
+ break;
+ }
+ if (strcmp(val, xbt_cfgelm_boolean_values[i].false_val) == 0){
+ bval = 0;
+ break;
+ }
+ }
+ xbt_assert(bval != -1, "Value of option '%s' not valid. Should be a boolean (yes,no,on,off,true,false,0,1)", val);
+ xbt_dynar_set(variable->content, 0, &bval);
+
+ if (variable->cb_set)
+ variable->cb_set(name);
+ variable->isdefault = false;
+}
+
+
+/* Say if the value is the default value */
+int xbt_cfg_is_default_value(const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_any);
+ return variable->isdefault;
+}
+
+/*----[ Getting ]---------------------------------------------------------*/
+/** @brief Retrieve an integer value of a variable (get a warning if not uniq)
+ *
+ * @param name the name of the variable
+ *
+ * Returns the first value from the config set under the given name.
+ * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
+ */
+int xbt_cfg_get_int(const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_int);
+
+ if (xbt_dynar_length(variable->content) > 1) {
+ 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);
+}
+
+/** @brief Retrieve a double value of a variable (get a warning if not uniq)
+ *
+ * @param cfg the config set
+ * @param name the name of the variable
+ *
+ * Returns the first value from the config set under the given name.
+ * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
+ */
+double xbt_cfg_get_double(const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_double);
+
+ if (xbt_dynar_length(variable->content) > 1) {
+ 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);
+}
+
+/** @brief Retrieve a string value of a variable (get a warning if not uniq)
+ *
+ * @param cfg the config set
+ * @param name the name of the variable
+ *
+ * Returns the first value from the config set under the given name.
+ * If there is more than one value, it will issue a warning. Consider using
+ * xbt_cfg_get_dynar() instead. Returns NULL if there is no value.
+ *
+ * \warning the returned value is the actual content of the config set
+ */
+char *xbt_cfg_get_string(const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_string);
+
+ if (xbt_dynar_length(variable->content) > 1) {
+ 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_is_empty(variable->content)) {
+ return NULL;
+ }
+
+ return xbt_dynar_get_as(variable->content, 0, char *);
+}
+
+/** @brief Retrieve a boolean value of a variable (get a warning if not uniq)
+ *
+ * @param cfg the config set
+ * @param name the name of the variable
+ *
+ * Returns the first value from the config set under the given name.
+ * If there is more than one value, it will issue a warning. Consider using xbt_cfg_get_dynar() instead.
+ */
+int xbt_cfg_get_boolean(const char *name)
+{
+ xbt_cfgelm_t variable = xbt_cfgelm_get(simgrid_config, name, xbt_cfgelm_boolean);
+
+ if (xbt_dynar_length(variable->content) > 1) {
+ 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);
+}
namespace simgrid {
namespace config {
-static void callCallback(const char* name, void* data)
+bool parseBool(const char* value)
{
- (*(std::function<void(const char*)>*) data)(name);
+ for (int i = 0; xbt_cfgelm_boolean_values[i].true_val != NULL; i++) {
+ if (std::strcmp(value, xbt_cfgelm_boolean_values[i].true_val) == 0)
+ return true;
+ if (std::strcmp(value, xbt_cfgelm_boolean_values[i].false_val) == 0)
+ return false;
+ }
+ throw std::range_error("not a boolean");
}
-static void freeCallback(void* data)
+double parseDouble(const char* value)
{
- delete (std::function<void(const char*)>*) data;
+ char* end;
+ errno = 0;
+ double res = std::strtod(value, &end);
+ if (errno == ERANGE)
+ throw std::range_error("out of range");
+ else if (errno)
+ xbt_die("Unexpected errno");
+ if (end == value || *end != '\0')
+ throw std::range_error("invalid double");
+ else
+ return res;
}
-void registerConfig(const char* name, const char* description,
- e_xbt_cfgelm_type_t type,
- std::function<void(const char*)> callback)
+long int parseLong(const char* value)
{
- std::function<void(const char*)>* code
- = new std::function<void(const char*)>(std::move(callback));
- xbt_cfg_register_ext(name, description, type,
- callCallback, code, freeCallback);
+ char* end;
+ errno = 0;
+ long int res = std::strtol(value, &end, 0);
+ if (errno) {
+ if (res == LONG_MIN && errno == ERANGE)
+ throw std::range_error("underflow");
+ else if (res == LONG_MAX && errno == ERANGE)
+ throw std::range_error("overflow");
+ xbt_die("Unexpected errno");
+ }
+ if (end == value || *end != '\0')
+ throw std::range_error("invalid integer");
+ else
+ return res;
}
+void declareFlag(const char* name, const char* description,
+ std::function<void(const char* value)> callback)
+{
+ xbt_cfg_register(&simgrid_config, name, description, xbt_cfgelm_string, NULL,
+ std::move(callback));
}
-}
\ No newline at end of file
+
+}
+}
+
+#ifdef SIMGRID_TEST
+
+#include <string>
+
+#include "xbt.h"
+#include "xbt/ex.h"
+
+#include <xbt/config.hpp>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg);
+
+XBT_TEST_SUITE("config", "Configuration support");
+
+static xbt_cfg_t make_set()
+{
+ xbt_cfg_t set = NULL;
+
+ xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
+ xbt_cfg_register_str(&set, "speed:int");
+ xbt_cfg_register_str(&set, "peername:string");
+ xbt_cfg_register_str(&set, "user:string");
+
+ return set;
+} /* end_of_make_set */
+
+XBT_PUBLIC_DATA(xbt_cfg_t) simgrid_config;
+
+XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
+{
+ simgrid_config = make_set();
+ xbt_test_add("Alloc and free a config set");
+ xbt_cfg_set_parse("peername:veloce user:bidule");
+ xbt_cfg_free(&simgrid_config);
+}
+
+XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
+{
+ simgrid_config = make_set();
+ xbt_test_add("Get a single value");
+ {
+ /* get_single_value */
+ int ival;
+
+ xbt_cfg_set_parse("peername:toto:42 speed:42");
+ ival = xbt_cfg_get_int("speed");
+ if (ival != 42)
+ xbt_test_fail("Speed value = %d, I expected 42", ival);
+ }
+
+ xbt_test_add("Access to a non-existant entry");
+ {
+ xbt_ex_t e;
+
+ TRY {
+ xbt_cfg_set_parse("color:blue");
+ } CATCH(e) {
+ if (e.category != not_found_error)
+ xbt_test_exception(e);
+ xbt_ex_free(e);
+ }
+ }
+ xbt_cfg_free(&simgrid_config);
+}
+
+XBT_TEST_UNIT("c++flags", test_config_cxx_flags, "C++ flags")
+{
+ simgrid_config = make_set();
+ xbt_test_add("C++ declaration of flags");
+
+ simgrid::config::Flag<int> int_flag("int", "", 0);
+ simgrid::config::Flag<std::string> string_flag("string", "", "foo");
+ simgrid::config::Flag<double> double_flag("double", "", 0.32);
+ simgrid::config::Flag<bool> bool_flag1("bool1", "", false);
+ simgrid::config::Flag<bool> bool_flag2("bool2", "", true);
+
+ xbt_test_add("Parse values");
+ xbt_cfg_set_parse("int:42 string:bar double:8.0 bool1:true bool2:false");
+ xbt_test_assert(int_flag == 42, "Check int flag");
+ xbt_test_assert(string_flag == "bar", "Check string flag");
+ xbt_test_assert(double_flag == 8.0, "Check double flag");
+ xbt_test_assert(bool_flag1, "Check bool1 flag");
+ xbt_test_assert(!bool_flag2, "Check bool2 flag");
+
+ xbt_cfg_free(&simgrid_config);
+}
+
+#endif /* SIMGRID_TEST */
src/xbt/RngStream.c
src/xbt/automaton/automaton.c
src/xbt/automaton/automatonparse_promela.c
- src/xbt/config.c
src/xbt/config.cpp
src/xbt/cunit.c
src/xbt/dict.c
src/xbt/swag.c
src/xbt/xbt_str.c
src/xbt/xbt_strbuff.c
- src/xbt/config.c
+ src/xbt/config.cpp
)
if(HAVE_MC)
