X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec09841c5c348a41ad076a0c5beae57448c1923e..68fddbaeb8d7a332bec9eb09ef0e7e548ac1850c:/src/xbt/config.cpp diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index 37c41b2076..cb6c810de6 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -1,9 +1,9 @@ -/* Copyright (c) 2004-2014,2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. 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 +#include #include #include @@ -11,11 +11,11 @@ #include #include +#include #include #include #include #include -#include #include #include @@ -51,10 +51,10 @@ const char* false_values[] = { static bool parseBool(const char* value) { - for (const char* true_value : true_values) + for (const char* const& true_value : true_values) if (std::strcmp(true_value, value) == 0) return true; - for (const char* false_value : false_values) + for (const char* const& false_value : false_values) if (std::strcmp(false_value, value) == 0) return false; throw std::range_error("not a boolean"); @@ -96,30 +96,34 @@ static long int parseLong(const char* value) // ***** ConfigType ***** /// A trait which define possible options types: -template struct ConfigType; +template class ConfigType; -template<> struct ConfigType { +template <> class ConfigType { +public: static constexpr const char* type_name = "int"; static inline double parse(const char* value) { return parseLong(value); } }; -template<> struct ConfigType { +template <> class ConfigType { +public: static constexpr const char* type_name = "double"; static inline double parse(const char* value) { return parseDouble(value); } }; -template<> struct ConfigType { +template <> class ConfigType { +public: static constexpr const char* type_name = "string"; static inline std::string parse(const char* value) { return std::string(value); } }; -template<> struct ConfigType { +template <> class ConfigType { +public: static constexpr const char* type_name = "boolean"; static inline bool parse(const char* value) { @@ -141,7 +145,6 @@ protected: bool isdefault = true; public: - /* Callback */ xbt_cfg_cb_t old_callback = nullptr; @@ -190,16 +193,13 @@ public: TypedConfigurationElement(const char* key, const char* desc, T value = T()) : ConfigurationElement(key, desc), content(std::move(value)) {} - TypedConfigurationElement(const char* key, const char* desc, T value, - xbt_cfg_cb_t cb) - : ConfigurationElement(key, desc, cb), content(std::move(value)) + TypedConfigurationElement(const char* key, const char* desc, T value, xbt_cfg_cb_t cb) + : ConfigurationElement(key, desc, cb), content(std::move(value)) {} - TypedConfigurationElement(const char* key, const char* desc, T value, - std::function callback) - : ConfigurationElement(key, desc), content(std::move(value)), - callback(std::move(callback)) + TypedConfigurationElement(const char* key, const char* desc, T value, std::function callback) + : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback)) {} - ~TypedConfigurationElement()=default; + ~TypedConfigurationElement() = default; std::string getStringValue() override; const char* getTypeName() override; @@ -227,8 +227,8 @@ public: this->content = std::move(value); this->update(); } else { - XBT_DEBUG("Do not override configuration variable '%s' with value '%s'" - " because it was already set.", key.c_str(), to_string(value).c_str()); + XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.", key.c_str(), + to_string(value).c_str()); } } }; @@ -260,9 +260,10 @@ const char* TypedConfigurationElement::getTypeName() // override class Config { private: // name -> ConfigElement: - std::unordered_map options; + std::map options; // alias -> xbt_dict_elm_t from options: - std::unordered_map aliases; + std::map aliases; + bool warn_for_aliases = true; public: Config() = default; @@ -302,20 +303,23 @@ protected: Config::~Config() { XBT_DEBUG("Frees cfg set %p", this); - for (auto elm : options) + for (auto const& elm : options) delete elm.second; } inline ConfigurationElement* Config::getDictElement(const char* name) { - try { - return options.at(name); - } catch (std::out_of_range& unfound) { - try { - ConfigurationElement* res = aliases.at(name); - XBT_INFO("Option %s has been renamed to %s. Consider switching.", name, res->getKey().c_str()); + auto opt = options.find(name); + if (opt != options.end()) { + return opt->second; + } else { + auto als = aliases.find(name); + if (als != aliases.end()) { + ConfigurationElement* res = als->second; + if (warn_for_aliases) + XBT_INFO("Option %s has been renamed to %s. Consider switching.", name, res->getKey().c_str()); return res; - } catch (std::out_of_range& missing_key) { + } else { throw simgrid::config::missing_key_error(std::string("Bad config key: ") + name); } } @@ -344,7 +348,7 @@ void Config::dump(const char *name, const char *indent) if (name) printf("%s>> Dumping of the config set '%s':\n", indent, name); - for (auto elm : options) + for (auto const& elm : options) printf("%s %s: ()%s) %s", indent, elm.first.c_str(), elm.second->getTypeName(), elm.second->getStringValue().c_str()); @@ -356,28 +360,19 @@ void Config::dump(const char *name, const char *indent) /** @brief Displays the declared aliases and their description */ void Config::showAliases() { - std::vector names; - - for (auto elm : aliases) - names.push_back(elm.first); - std::sort(names.begin(), names.end()); - - for (auto name : names) - printf(" %s: %s\n", name.c_str(), (*this)[name.c_str()].getDescription().c_str()); + bool old_warn_for_aliases = false; + std::swap(warn_for_aliases, old_warn_for_aliases); + for (auto const& elm : aliases) + printf(" %s: %s\n", elm.first.c_str(), (*this)[elm.first.c_str()].getDescription().c_str()); + std::swap(warn_for_aliases, old_warn_for_aliases); } /** @brief Displays the declared options and their description */ void Config::help() { - std::vector names; - - for (auto elm : options) - names.push_back(elm.first); - std::sort(names.begin(), names.end()); - - for (auto name : names) { - simgrid::config::ConfigurationElement* variable = this->options.at(name); - printf(" %s: %s\n", name.c_str(), variable->getDescription().c_str()); + for (auto const& elm : options) { + simgrid::config::ConfigurationElement* variable = this->options.at(elm.first); + printf(" %s: %s\n", elm.first.c_str(), variable->getDescription().c_str()); printf(" Type: %s; ", variable->getTypeName()); printf("Current value: %s\n", variable->getStringValue().c_str()); } @@ -528,7 +523,6 @@ void xbt_cfg_set_parse(const char *options) /* 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) @@ -574,8 +568,7 @@ on_exception: } // Horrible mess to translate C++ exceptions to C exceptions: -// Exit from the catch blog (and do the correct exceptio cleaning) -// before attempting to THROWF. +// Exit from the catch block (and do the correct exception cleaning) before attempting to THROWF. #define TRANSLATE_EXCEPTIONS(...) \ catch(simgrid::config::missing_key_error& e) { THROWF(not_found_error, 0, __VA_ARGS__); abort(); } \ catch(...) { THROWF(not_found_error, 0, __VA_ARGS__); abort(); } @@ -606,8 +599,7 @@ void xbt_cfg_setdefault_int(const char *key, int value) (*simgrid_config)[key].setDefaultValue(value); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to default integer %i", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to default integer %i", key, value); } /** @brief Set an integer value to \a name within \a cfg if it wasn't changed yet @@ -621,8 +613,7 @@ void xbt_cfg_setdefault_double(const char *key, double value) (*simgrid_config)[key].setDefaultValue(value); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to default double %f", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to default double %f", key, value); } /** @brief Set a string value to \a name within \a cfg if it wasn't changed yet @@ -636,8 +627,7 @@ void xbt_cfg_setdefault_string(const char *key, const char *value) (*simgrid_config)[key].setDefaultValue(value ? value : ""); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to default string %s", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to default string %s", key, value); } /** @brief Set an boolean value to \a name within \a cfg if it wasn't changed yet @@ -651,8 +641,7 @@ void xbt_cfg_setdefault_boolean(const char *key, const char *value) (*simgrid_config)[key].setDefaultValue(simgrid::config::parseBool(value)); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to default boolean %s", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to default boolean %s", key, value); } /** @brief Set an integer value to \a name within \a cfg @@ -666,8 +655,7 @@ void xbt_cfg_set_int(const char *key, int value) (*simgrid_config)[key].setValue(value); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to integer %i", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to integer %i", key, value); } /** @brief Set or add a double value to \a name within \a cfg @@ -681,8 +669,7 @@ void xbt_cfg_set_double(const char *key, double value) (*simgrid_config)[key].setValue(value); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to double %f", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to double %f", key, value); } /** @brief Set or add a string value to \a name within \a cfg @@ -697,8 +684,7 @@ void xbt_cfg_set_string(const char *key, const char *value) (*simgrid_config)[key].setValue(value ? value : ""); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to string %s", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to string %s", key, value); } /** @brief Set or add a boolean value to \a name within \a cfg @@ -712,8 +698,7 @@ void xbt_cfg_set_boolean(const char *key, const char *value) (*simgrid_config)[key].setValue(simgrid::config::parseBool(value)); return; } - TRANSLATE_EXCEPTIONS("Could not set variable %s to boolean %s", - key, value); + TRANSLATE_EXCEPTIONS("Could not set variable %s to boolean %s", key, value); } @@ -830,10 +815,8 @@ XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests") 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"); + int ival = xbt_cfg_get_int("speed"); if (ival != 42) xbt_test_fail("Speed value = %d, I expected 42", ival); }