X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7fbd4746cc813549778670691ea29b4ae271906..ff0e46f9b3c4eb1d9e478ea38bb4f71238df3c67:/src/xbt/config.cpp diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index 977bad1502..5b8ec4ac31 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -38,8 +38,6 @@ namespace config { missing_key_error::~missing_key_error() = default; -class Config; - namespace { const char* true_values[] = { @@ -51,10 +49,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 +94,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) { @@ -135,13 +137,12 @@ template class TypedConfigurationElement; // **** ConfigurationElement **** class ConfigurationElement { -protected: +private: std::string key; std::string desc; bool isdefault = true; public: - /* Callback */ xbt_cfg_cb_t old_callback = nullptr; @@ -171,6 +172,7 @@ public: { dynamic_cast&>(*this).setDefaultValue(std::move(value)); } + void unsetDefault() { isdefault = false; } bool isDefault() const { return isdefault; } std::string const& getDescription() const { return desc; } @@ -190,16 +192,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; @@ -208,7 +207,7 @@ public: void update() { if (old_callback) - this->old_callback(key.c_str()); + this->old_callback(getKey().c_str()); if (this->callback) this->callback(this->content); } @@ -223,12 +222,12 @@ public: void setDefaultValue(T value) { - if (this->isdefault) { + if (this->isDefault()) { 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.", + getKey().c_str(), to_string(value).c_str()); } } }; @@ -243,7 +242,7 @@ template void TypedConfigurationElement::setStringValue(const char* value) // override { this->content = ConfigType::parse(value); - this->isdefault = false; + this->unsetDefault(); this->update(); } @@ -303,21 +302,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); + 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); } } @@ -346,7 +347,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()); @@ -360,7 +361,7 @@ void Config::showAliases() { bool old_warn_for_aliases = false; std::swap(warn_for_aliases, old_warn_for_aliases); - for (auto elm : 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); } @@ -368,7 +369,7 @@ void Config::showAliases() /** @brief Displays the declared options and their description */ void Config::help() { - for (auto elm : options) { + 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()); @@ -497,53 +498,37 @@ void xbt_cfg_set_parse(const char *options) if (not options || not 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 (not 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 = nullptr; /* 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 = nullptr; /* don't do next iteration */ - } - XBT_DEBUG("parse now:'%s'; parse later:'%s'", name, option); - - if (name[0] == ' ' || name[0] == '\n' || name[0] == '\t') + std::string optionlist(options); + while (not optionlist.empty()) { + XBT_DEBUG("Still to parse and set: '%s'", optionlist.c_str()); + + // skip separators + size_t pos = optionlist.find_first_not_of(" \t\n,"); + optionlist.erase(0, pos); + // find option + pos = optionlist.find_first_of(" \t\n,"); + std::string name = optionlist.substr(0, pos); + optionlist.erase(0, pos); + XBT_DEBUG("parse now:'%s'; parse later:'%s'", name.c_str(), optionlist.c_str()); + + if (name.empty()) continue; - if (not 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'; + pos = name.find(':'); + xbt_assert(pos != std::string::npos, "Option '%s' badly formatted. Should be of the form 'name:value'", + name.c_str()); - if (strncmp(name, "path", strlen("path"))) - XBT_INFO("Configuration change: Set '%s' to '%s'", name, val); + std::string val = name.substr(pos + 1); + name.erase(pos); + + const std::string path("path"); + if (name.compare(0, path.length(), path) != 0) + XBT_INFO("Configuration change: Set '%s' to '%s'", name.c_str(), val.c_str()); try { - (*simgrid_config)[name].setStringValue(val); + (*simgrid_config)[name.c_str()].setStringValue(val.c_str()); } catch (simgrid::config::missing_key_error& e) { goto on_missing_key; @@ -552,23 +537,17 @@ void xbt_cfg_set_parse(const char *options) goto on_exception; } } - - free(optionlist_cpy); return; /* Do not THROWF from a C++ exception catching context, or some cleanups will be missing */ on_missing_key: - free(optionlist_cpy); THROWF(not_found_error, 0, "Could not set variables %s", options); - return; on_exception: - free(optionlist_cpy); THROWF(unknown_error, 0, "Could not set variables %s", options); } // 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(); } @@ -599,8 +578,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 @@ -614,8 +592,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 @@ -629,8 +606,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 @@ -644,8 +620,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 @@ -659,8 +634,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 @@ -674,8 +648,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 @@ -690,8 +663,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 @@ -705,8 +677,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); } @@ -823,10 +794,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); }