-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2020. 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. */
namespace {
-const char* true_values[] = {
- "yes", "on", "true", "1"
-};
-const char* false_values[] = {
- "no", "off", "false", "0"
-};
-
-static bool parse_bool(const char* value)
+bool parse_bool(const char* value)
{
- for (const char* const& true_value : true_values)
+ for (const char* true_value : {"yes", "on", "true", "1"})
if (std::strcmp(true_value, value) == 0)
return true;
- for (const char* const& false_value : false_values)
+ for (const char* false_value : {"no", "off", "false", "0"})
if (std::strcmp(false_value, value) == 0)
return false;
throw std::range_error("not a boolean");
}
-static double parse_double(const char* value)
+double parse_double(const char* value)
{
char* end;
errno = 0;
return res;
}
-static long int parse_long(const char* value)
+long int parse_long(const char* value)
{
char* end;
errno = 0;
template <> class ConfigType<int> {
public:
static constexpr const char* type_name = "int";
- static inline double parse(const char* value)
+ static inline int parse(const char* value)
{
- return parse_long(value);
+ long val = parse_long(value);
+ if (val < INT_MIN)
+ throw std::range_error("underflow");
+ if (val > INT_MAX)
+ throw std::range_error("overflow");
+ return static_cast<int>(val);
}
};
template <> class ConfigType<double> {
bool isdefault = true;
public:
- /* Callback */
- xbt_cfg_cb_t old_callback = nullptr;
-
ConfigurationElement(const std::string& key, const std::string& desc) : key(key), desc(desc) {}
- ConfigurationElement(const std::string& key, const std::string& desc, xbt_cfg_cb_t cb)
- : key(key), desc(desc), old_callback(cb)
- {
- }
virtual ~ConfigurationElement() = default;
TypedConfigurationElement(const std::string& key, const std::string& desc, T value = T())
: ConfigurationElement(key, desc), content(std::move(value))
{}
- TypedConfigurationElement(const std::string& key, const std::string& desc, T value, xbt_cfg_cb_t cb)
- : ConfigurationElement(key, desc, cb), content(std::move(value))
- {}
TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function<void(T&)> callback)
: ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback))
{}
- ~TypedConfigurationElement() = default;
+ ~TypedConfigurationElement() override = default;
std::string get_string_value() override;
const char* get_type_name() override;
void update()
{
- if (old_callback)
- this->old_callback(get_key().c_str());
if (this->callback)
this->callback(this->content);
}
this->update();
} else {
XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.",
- get_key().c_str(), to_string(value).c_str());
+ get_key().c_str(), get_string_value().c_str());
}
}
};
return to_string(content);
}
+template <> std::string TypedConfigurationElement<double>::get_string_value() // override
+{
+ // don't want std::to_string which uses %f, and formats very small values as 0.000000
+ return xbt::string_printf("%g", content);
+}
+
template <class T> void TypedConfigurationElement<T>::set_string_value(const char* value) // override
{
this->content = ConfigType<T>::parse(value);
{
xbt_assert(options.find(name) == options.end(), "Refusing to register the config element '%s' twice.",
name.c_str());
-
TypedConfigurationElement<T>* variable = new TypedConfigurationElement<T>(name, std::forward<A>(a)...);
+
auto* variable = new TypedConfigurationElement<T>(name, std::forward<A>(a)...);
XBT_DEBUG("Register cfg elm %s (%s) of type %s @%p in set %p)", name.c_str(), variable->get_description().c_str(),
variable->get_type_name(), variable, this);
options[name].reset(variable);
}
// Debug:
- void dump(const char *name, const char *indent);
- void show_aliases();
- void help();
+ void dump(const char* name, const char* indent) const;
+ void show_aliases() const;
+ void help() const;
protected:
ConfigurationElement* get_dict_element(const std::string& name);
XBT_INFO("Option %s has been renamed to %s. Consider switching.", name.c_str(), res->get_key().c_str());
return res;
} else {
- throw std::out_of_range("Bad config key: " + name);
+ std::string msg = "Bad config key: " + name + "\nExisting config keys:\n";
+ for (auto const& elm : options)
+ msg += " " + elm.first + ": (" + elm.second->get_type_name() + ")" + elm.second->get_string_value() + "\n";
+ throw std::out_of_range(msg);
}
}
}
this->aliases.insert({aliasname, element});
}
-/** @brief Dump a config set for debuging purpose
+/** @brief Dump a config set for debugging 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)
*/
-void Config::dump(const char *name, const char *indent)
+void Config::dump(const char* name, const char* indent) const
{
- XBT_LOG_DEFAULT_CATEGORY(xbt_help);
if (name)
- XBT_VERB("%s>> Dumping of the config set '%s':", indent, name);
+ XBT_CVERB(xbt_help, "%s>> Dumping of the config set '%s':", indent, name);
for (auto const& elm : options)
- XBT_VERB("%s %s: ()%s) %s", indent, elm.first.c_str(), elm.second->get_type_name(),
- elm.second->get_string_value().c_str());
+ XBT_CVERB(xbt_help, "%s %s: ()%s) %s", indent, elm.first.c_str(), elm.second->get_type_name(),
+ elm.second->get_string_value().c_str());
if (name)
- XBT_VERB("%s<< End of the config set '%s'", indent, name);
+ XBT_CVERB(xbt_help, "%s<< End of the config set '%s'", indent, name);
}
/** @brief Displays the declared aliases and their replacement */
-void Config::show_aliases()
+void Config::show_aliases() const
{
for (auto const& elm : aliases)
XBT_HELP(" %-40s %s", elm.first.c_str(), elm.second->get_key().c_str());
}
/** @brief Displays the declared options and their description */
-void Config::help()
+void Config::help() const
{
for (auto const& elm : options) {
simgrid::config::ConfigurationElement* variable = elm.second.get();
* @param key the name of the variable
* @param value the value of the variable
*/
-void xbt_cfg_set_int(const char *key, int value)
-{
- sg_cfg_set_int(key, value);
-}
-
void sg_cfg_set_int(const char* key, int value)
{
(*simgrid_config)[key].set_value<int>(value);
* @param key the name of the variable
* @param value the double to set
*/
-void xbt_cfg_set_double(const char *key, double value)
-{
- sg_cfg_set_double(key, value);
-}
-
void sg_cfg_set_double(const char* key, double value)
{
(*simgrid_config)[key].set_value<double>(value);
* @param value the value to be added
*
*/
-void xbt_cfg_set_string(const char* key, const char* value)
-{
- sg_cfg_set_string(key, value);
-}
-
void sg_cfg_set_string(const char* key, const char* value)
{
(*simgrid_config)[key].set_value<std::string>(value);
* @param key the name of the variable
* @param value the value of the variable
*/
-void xbt_cfg_set_boolean(const char *key, const char *value)
-{
- sg_cfg_set_boolean(key, value);
-}
-
void sg_cfg_set_boolean(const char* key, const char* value)
{
(*simgrid_config)[key].set_value<bool>(simgrid::config::parse_bool(value));
*
* Returns the first value from the config set under the given name.
*/
-int xbt_cfg_get_int(const char *key)
-{
- return sg_cfg_get_int(key);
-}
-
int sg_cfg_get_int(const char* key)
{
return (*simgrid_config)[key].get_value<int>();
*
* Returns the first value from the config set under the given name.
*/
-double xbt_cfg_get_double(const char *key)
-{
- return sg_cfg_get_double(key);
-}
-
double sg_cfg_get_double(const char* key)
{
return (*simgrid_config)[key].get_value<double>();
* Returns the first value from the config set under the given name.
* If there is more than one value, it will issue a warning.
*/
-int xbt_cfg_get_boolean(const char *key)
-{
- return sg_cfg_get_boolean(key);
-}
-
int sg_cfg_get_boolean(const char* key)
{
return (*simgrid_config)[key].get_value<bool>() ? 1 : 0;
