X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65beede857f93e33c96e544f76b93793c973dc10..83e12528b0f7fde3d3fc54fe56626c2043c39280:/src/xbt/config.cpp diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index 7fbc10f6e1..b689db3738 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -140,14 +141,7 @@ private: 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; @@ -187,9 +181,6 @@ public: 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 callback) : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback)) {} @@ -201,8 +192,6 @@ public: void update() { - if (old_callback) - this->old_callback(get_key().c_str()); if (this->callback) this->callback(this->content); } @@ -252,14 +241,13 @@ template const char* TypedConfigurationElement::get_type_name() // class Config { private: // name -> ConfigElement: - std::map options; + std::map> options; // alias -> ConfigElement from options: - std::map aliases; + std::map aliases; bool warn_for_aliases = true; public: Config(); - ~Config(); // No copy: Config(Config const&) = delete; @@ -268,15 +256,14 @@ public: ConfigurationElement& operator[](const std::string& name); void alias(const std::string& realname, const std::string& aliasname); - template - simgrid::config::TypedConfigurationElement* register_option(const std::string& name, A&&... a) + template TypedConfigurationElement* register_option(const std::string& name, A&&... a) { xbt_assert(options.find(name) == options.end(), "Refusing to register the config element '%s' twice.", name.c_str()); TypedConfigurationElement* variable = new TypedConfigurationElement(name, std::forward(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.insert({name, variable}); + options[name].reset(variable); variable->update(); return variable; } @@ -294,18 +281,12 @@ Config::Config() { atexit(&sg_config_finalize); } -Config::~Config() -{ - XBT_DEBUG("Frees cfg set %p", this); - for (auto const& elm : options) - delete elm.second; -} inline ConfigurationElement* Config::get_dict_element(const std::string& name) { auto opt = options.find(name); if (opt != options.end()) { - return opt->second; + return opt->second.get(); } else { auto als = aliases.find(name); if (als != aliases.end()) { @@ -314,7 +295,10 @@ 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 { - THROWF(not_found_error, 0, "Bad config key: %s", name.c_str()); + 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); } } } @@ -332,40 +316,39 @@ void Config::alias(const std::string& realname, const std::string& aliasname) 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) { + XBT_LOG_DEFAULT_CATEGORY(xbt_help); if (name) - printf("%s>> Dumping of the config set '%s':\n", indent, name); + XBT_VERB("%s>> Dumping of the config set '%s':", indent, name); for (auto const& elm : options) - printf("%s %s: ()%s) %s", indent, elm.first.c_str(), elm.second->get_type_name(), - elm.second->get_string_value().c_str()); + XBT_VERB("%s %s: ()%s) %s", indent, elm.first.c_str(), elm.second->get_type_name(), + elm.second->get_string_value().c_str()); if (name) - printf("%s<< End of the config set '%s'\n", indent, name); - fflush(stdout); + XBT_VERB("%s<< End of the config set '%s'", indent, name); } /** @brief Displays the declared aliases and their replacement */ void Config::show_aliases() { for (auto const& elm : aliases) - printf(" %-40s %s\n", elm.first.c_str(), elm.second->get_key().c_str()); + 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() { for (auto const& elm : options) { - simgrid::config::ConfigurationElement* variable = this->options.at(elm.first); - printf(" %s: %s\n", elm.first.c_str(), variable->get_description().c_str()); - printf(" Type: %s; ", variable->get_type_name()); - printf("Current value: %s\n", variable->get_string_value().c_str()); + simgrid::config::ConfigurationElement* variable = elm.second.get(); + XBT_HELP(" %s: %s", elm.first.c_str(), variable->get_description().c_str()); + XBT_HELP(" Type: %s; Current value: %s", variable->get_type_name(), variable->get_string_value().c_str()); } } @@ -502,7 +485,7 @@ void help() * @param key the name of the variable * @param value the value of the variable */ -void xbt_cfg_set_int(const char *key, int value) +void sg_cfg_set_int(const char* key, int value) { (*simgrid_config)[key].set_value(value); } @@ -512,7 +495,7 @@ void xbt_cfg_set_int(const char *key, 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) +void sg_cfg_set_double(const char* key, double value) { (*simgrid_config)[key].set_value(value); } @@ -523,7 +506,7 @@ void xbt_cfg_set_double(const char *key, double value) * @param value the value to be added * */ -void xbt_cfg_set_string(const char* key, const char* value) +void sg_cfg_set_string(const char* key, const char* value) { (*simgrid_config)[key].set_value(value); } @@ -533,7 +516,7 @@ void xbt_cfg_set_string(const char* key, const char* 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) +void sg_cfg_set_boolean(const char* key, const char* value) { (*simgrid_config)[key].set_value(simgrid::config::parse_bool(value)); } @@ -545,7 +528,7 @@ void xbt_cfg_set_boolean(const char *key, const char *value) * * Returns the first value from the config set under the given name. */ -int xbt_cfg_get_int(const char *key) +int sg_cfg_get_int(const char* key) { return (*simgrid_config)[key].get_value(); } @@ -556,7 +539,7 @@ int xbt_cfg_get_int(const char *key) * * Returns the first value from the config set under the given name. */ -double xbt_cfg_get_double(const char *key) +double sg_cfg_get_double(const char* key) { return (*simgrid_config)[key].get_value(); } @@ -568,7 +551,7 @@ double xbt_cfg_get_double(const char *key) * 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) +int sg_cfg_get_boolean(const char* key) { return (*simgrid_config)[key].get_value() ? 1 : 0; }