X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..4a69abcc786d029bd2962537f767d12a0f808d11:/src/xbt/config.cpp diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index eaa8450d2f..bbbbf29399 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -14,7 +15,9 @@ #include #include #include +#include +#include #include #include #include "xbt/misc.h" @@ -29,11 +32,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support"); XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = nullptr; +extern "C" { + XBT_PUBLIC(void) sg_config_finalize(); +} namespace simgrid { namespace config { -missing_key_error::~missing_key_error() noexcept {} +missing_key_error::~missing_key_error() = default; class Config; @@ -147,7 +153,7 @@ public: ConfigurationElement(const char* key, const char* desc, xbt_cfg_cb_t cb) : key(key ? key : ""), desc(desc ? desc : ""), old_callback(cb) {} - virtual ~ConfigurationElement(); + virtual ~ConfigurationElement()=default; virtual std::string getStringValue() = 0; virtual void setStringValue(const char* value) = 0; @@ -173,8 +179,6 @@ public: std::string const& getDescription() const { return desc; } }; -ConfigurationElement::~ConfigurationElement() {} - // **** TypedConfigurationElement **** // TODO, could we use boost::any with some Type* reference? @@ -197,7 +201,7 @@ public: : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback)) {} - ~TypedConfigurationElement() override; + ~TypedConfigurationElement()=default; std::string getStringValue() override; const char* getTypeName() override; @@ -251,10 +255,6 @@ const char* TypedConfigurationElement::getTypeName() // override return ConfigType::type_name; } -template -TypedConfigurationElement::~TypedConfigurationElement() -{} - } // end of anonymous namespace // **** Config **** @@ -386,16 +386,15 @@ void Config::dump(const char *name, const char *indent) void Config::showAliases() { xbt_dict_cursor_t dict_cursor; - unsigned int dynar_cursor; xbt_dictelm_t dictel; char *name; - xbt_dynar_t names = xbt_dynar_new(sizeof(char *), nullptr); + std::vector names; xbt_dict_foreach(this->aliases, dict_cursor, name, dictel) - xbt_dynar_push(names, &name); - xbt_dynar_sort_strings(names); + names.push_back(name); + std::sort(names.begin(), names.end()); - xbt_dynar_foreach(names, dynar_cursor, name) + for (auto name : names) printf(" %s: %s\n", name, (*this)[name].getDescription().c_str()); } @@ -403,22 +402,20 @@ void Config::showAliases() void Config::help() { xbt_dict_cursor_t dict_cursor; - unsigned int dynar_cursor; simgrid::config::ConfigurationElement* variable; char *name; - xbt_dynar_t names = xbt_dynar_new(sizeof(char *), nullptr); + std::vector names; xbt_dict_foreach(this->options, dict_cursor, name, variable) - xbt_dynar_push(names, &name); - xbt_dynar_sort_strings(names); + names.push_back(name); + std::sort(names.begin(), names.end()); - xbt_dynar_foreach(names, dynar_cursor, name) { + for (auto name : names) { variable = (simgrid::config::ConfigurationElement*) xbt_dict_get(this->options, name); printf(" %s: %s\n", name, variable->getDescription().c_str()); printf(" Type: %s; ", variable->getTypeName()); printf("Current value: %s\n", variable->getStringValue().c_str()); } - xbt_dynar_free(&names); } // ***** getConfig ***** @@ -447,8 +444,10 @@ template XBT_PUBLIC(void) declareFlag(const char* name, const char* description, T value, std::function callback) { - if (simgrid_config == nullptr) + if (simgrid_config == nullptr) { simgrid_config = xbt_cfg_new(); + atexit(sg_config_finalize); + } simgrid_config->registerOption( name, description, std::move(value), std::move(callback)); } @@ -467,7 +466,7 @@ template XBT_PUBLIC(void) declareFlag(const char* name, // ***** C bindings ***** -xbt_cfg_t xbt_cfg_new(void) { return new simgrid::config::Config(); } +xbt_cfg_t xbt_cfg_new() { return new simgrid::config::Config(); } void xbt_cfg_free(xbt_cfg_t * cfg) { delete *cfg; } void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg) @@ -487,35 +486,43 @@ void xbt_cfg_register_double(const char *name, double default_value, void xbt_cfg_register_int(const char *name, int default_value,xbt_cfg_cb_t cb_set, const char *desc) { - if (simgrid_config == nullptr) + if (simgrid_config == nullptr) { simgrid_config = xbt_cfg_new(); + atexit(&sg_config_finalize); + } simgrid_config->registerOption(name, desc, default_value, cb_set); } void xbt_cfg_register_string(const char *name, const char *default_value, xbt_cfg_cb_t cb_set, const char *desc) { - if (simgrid_config == nullptr) + if (simgrid_config == nullptr) { simgrid_config = xbt_cfg_new(); + atexit(sg_config_finalize); + } simgrid_config->registerOption(name, desc, default_value ? default_value : "", cb_set); } void xbt_cfg_register_boolean(const char *name, const char*default_value,xbt_cfg_cb_t cb_set, const char *desc) { - if (simgrid_config == nullptr) + if (simgrid_config == nullptr) { simgrid_config = xbt_cfg_new(); + atexit(sg_config_finalize); + } simgrid_config->registerOption(name, desc, simgrid::config::parseBool(default_value), cb_set); } void xbt_cfg_register_alias(const char *realname, const char *aliasname) { - if (simgrid_config == nullptr) + if (simgrid_config == nullptr) { simgrid_config = xbt_cfg_new(); + atexit(sg_config_finalize); + } simgrid_config->alias(realname, aliasname); } -void xbt_cfg_aliases(void) { simgrid_config->showAliases(); } -void xbt_cfg_help(void) { simgrid_config->help(); } +void xbt_cfg_aliases() { simgrid_config->showAliases(); } +void xbt_cfg_help() { simgrid_config->help(); } /*----[ Setting ]---------------------------------------------------------*/ @@ -574,7 +581,7 @@ void xbt_cfg_set_parse(const char *options) /* don't free(optionlist_cpy) if the assert fails, 'name' points inside it */ *(val++) = '\0'; - if (strncmp(name, "contexts/", strlen("contexts/")) && strncmp(name, "path", strlen("path"))) + if (strncmp(name, "path", strlen("path"))) XBT_INFO("Configuration change: Set '%s' to '%s'", name, val); try { @@ -591,6 +598,7 @@ void xbt_cfg_set_parse(const char *options) 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); @@ -598,7 +606,6 @@ on_missing_key: on_exception: free(optionlist_cpy); THROWF(unknown_error, 0, "Could not set variables %s", options); - return; } // Horrible mess to translate C++ exceptions to C exceptions: @@ -822,6 +829,7 @@ int xbt_cfg_get_boolean(const char *key) #include "xbt.h" #include "xbt/ex.h" +#include #include