X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b89437671ba572a199dd4ff5766ba82720cdf03..7e89aba517695064f20f89bbbd1ed889847e0efd:/src/xbt/config.cpp diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index ef9fcf678a..d61be8721b 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. 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. */ @@ -16,8 +16,6 @@ #include #include #include -#include -#include #include #include "simgrid/Exception.hpp" @@ -38,55 +36,41 @@ namespace config { 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; double res = std::strtod(value, &end); if (errno == ERANGE) throw std::range_error("out of range"); - else if (errno) - xbt_die("Unexpected errno"); + xbt_assert(errno == 0, "Unexpected errno: %d", errno); if (end == value || *end != '\0') throw std::range_error("invalid double"); - else - return res; + return res; } -static long int parse_long(const char* value) +long int parse_long(const char* value) { 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 (errno == ERANGE) + throw std::range_error(res == LONG_MIN ? "underflow" : "overflow"); + xbt_assert(errno == 0, "Unexpected errno: %d", errno); if (end == value || *end != '\0') throw std::range_error("invalid integer"); - else - return res; + return res; } // ***** ConfigType ***** @@ -189,7 +173,6 @@ public: TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function callback) : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback)) {} - ~TypedConfigurationElement() = default; std::string get_string_value() override; const char* get_type_name() override; @@ -217,7 +200,7 @@ public: 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()); } } }; @@ -227,6 +210,12 @@ template std::string TypedConfigurationElement::get_string_value() return to_string(content); } +template <> std::string TypedConfigurationElement::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 void TypedConfigurationElement::set_string_value(const char* value) // override { this->content = ConfigType::parse(value); @@ -246,9 +235,9 @@ template const char* TypedConfigurationElement::get_type_name() // class Config { private: // name -> ConfigElement: - std::map> options; + std::map, std::less<>> options; // alias -> ConfigElement from options: - std::map aliases; + std::map> aliases; bool warn_for_aliases = true; public: @@ -273,8 +262,6 @@ public: return variable; } - // Debug: - void dump(const char* name, const char* indent) const; void show_aliases() const; void help() const; @@ -300,7 +287,12 @@ inline ConfigurationElement* Config::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 { - std::string msg = "Bad config key: " + name + "\nExisting config keys:\n"; + std::string msg = "Bad config key: " + name + "\n"; + std::string kebab = name; + std::replace(begin(kebab), end(kebab), '_', '-'); // convert from snake_case to kebab-case + if (options.count(kebab) > 0) + msg += "Did you mean '" + kebab + "'?\n"; + msg += "Existing 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); @@ -321,24 +313,6 @@ void Config::alias(const std::string& realname, const std::string& aliasname) this->aliases.insert({aliasname, element}); } -/** @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) const -{ - if (name) - XBT_CVERB(xbt_help, "%s>> Dumping of the config set '%s':", indent, name); - - for (auto const& elm : options) - 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_CVERB(xbt_help, "%s<< End of the config set '%s'", indent, name); -} - /** @brief Displays the declared aliases and their replacement */ void Config::show_aliases() const {