#include <stdio.h>
+#include <algorithm>
#include <cerrno>
#include <cstring>
#include <climits>
#include <string>
#include <typeinfo>
#include <type_traits>
+#include <vector>
+#include <xbt/ex.hpp>
#include <xbt/config.h>
#include <xbt/config.hpp>
#include "xbt/misc.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
-XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = NULL;
+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;
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;
std::string const& getDescription() const { return desc; }
};
-ConfigurationElement::~ConfigurationElement() {}
-
// **** TypedConfigurationElement<T> ****
// TODO, could we use boost::any with some Type* reference?
: ConfigurationElement(key, desc), content(std::move(value)),
callback(std::move(callback))
{}
- ~TypedConfigurationElement() override;
+ ~TypedConfigurationElement()=default;
std::string getStringValue() override;
const char* getTypeName() override;
return ConfigType<T>::type_name;
}
-template<class T>
-TypedConfigurationElement<T>::~TypedConfigurationElement()
-{}
-
} // end of anonymous namespace
// **** Config ****
name,
variable->getDescription().c_str(),
variable->getTypeName(), variable, this);
- xbt_dict_set(this->options, name, variable, NULL);
+ xbt_dict_set(this->options, name, variable, nullptr);
variable->update();
return variable;
}
Config::Config() :
options(xbt_dict_new_homogeneous(xbt_cfgelm_free)),
- aliases(xbt_dict_new_homogeneous(NULL))
+ aliases(xbt_dict_new_homogeneous(nullptr))
{}
Config::~Config()
xbt_assert(this->getDictElement(aliasname) == nullptr, "Alias '%s' already.", aliasname);
xbt_dictelm_t element = this->getDictElement(realname);
xbt_assert(element, "Cannot define an alias to the non-existing option '%s'.", realname);
- xbt_dict_set(this->aliases, aliasname, element, NULL);
+ xbt_dict_set(this->aliases, aliasname, element, nullptr);
}
/** @brief Dump a config set for debuging purpose
void Config::dump(const char *name, const char *indent)
{
xbt_dict_t dict = this->options;
- xbt_dict_cursor_t cursor = NULL;
- simgrid::config::ConfigurationElement* variable = NULL;
- char *key = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
+ simgrid::config::ConfigurationElement* variable = nullptr;
+ char *key = nullptr;
if (name)
printf("%s>> Dumping of the config set '%s':\n", indent, name);
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 *), NULL);
+ std::vector<char*> 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());
}
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 *), NULL);
+ std::vector<char*> 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 *****
XBT_PUBLIC(void) declareFlag(const char* name, const char* description,
T value, std::function<void(const T&)> callback)
{
- if (simgrid_config == NULL)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->registerOption<T>(
name, description, std::move(value), std::move(callback));
}
// ***** 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)
void xbt_cfg_register_double(const char *name, double default_value,
xbt_cfg_cb_t cb_set, const char *desc)
{
- if (simgrid_config == NULL)
+ if (simgrid_config == nullptr)
simgrid_config = xbt_cfg_new();
simgrid_config->registerOption<double>(name, desc, default_value, cb_set);
}
void xbt_cfg_register_int(const char *name, int default_value,xbt_cfg_cb_t cb_set, const char *desc)
{
- if (simgrid_config == NULL)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(&sg_config_finalize);
+ }
simgrid_config->registerOption<int>(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 == NULL)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->registerOption<std::string>(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 == NULL)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->registerOption<bool>(name, desc, simgrid::config::parseBool(default_value), cb_set);
}
void xbt_cfg_register_alias(const char *realname, const char *aliasname)
{
- if (simgrid_config == NULL)
+ 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 ]---------------------------------------------------------*/
}
if (option - name == len) {
XBT_DEBUG("Boundary=EOL");
- option = NULL; /* don't do next iteration */
+ 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++;
}
if (option - name == len - 1)
- option = NULL; /* don't do next iteration */
+ option = nullptr; /* don't do next iteration */
}
XBT_DEBUG("parse now:'%s'; parse later:'%s'", name, option);
/* 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 {
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);
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:
// Exit from the catch blog (and do the correct exceptio cleaning)
// before attempting to THROWF.
#define TRANSLATE_EXCEPTIONS(...) \
- catch(simgrid::config::missing_key_error& e) { goto on_exception; } \
- catch(...) { goto on_missing_key; } \
- on_missing_key: THROWF(not_found_error, 0, __VA_ARGS__); \
- on_exception: THROWF(not_found_error, 0, __VA_ARGS__);
+ catch(simgrid::config::missing_key_error& e) { THROWF(not_found_error, 0, __VA_ARGS__); abort(); } \
+ catch(...) { THROWF(not_found_error, 0, __VA_ARGS__); abort(); }
/** @brief Set the value of a variable, using the string representation of that value
*
*
* Returns the first value from the config set under the given name.
* If there is more than one value, it will issue a warning.
- * Returns NULL if there is no value.
+ * Returns nullptr if there is no value.
*
* \warning the returned value is the actual content of the config set
*/
#include "xbt.h"
#include "xbt/ex.h"
+#include <xbt/ex.hpp>
#include <xbt/config.hpp>
static void make_set()
{
- simgrid_config = NULL;
+ simgrid_config = nullptr;
xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
- xbt_cfg_register_int("speed", 0, NULL, "");
- xbt_cfg_register_string("peername", "", NULL, "");
- xbt_cfg_register_string("user", "", NULL, "");
+ xbt_cfg_register_int("speed", 0, nullptr, "");
+ xbt_cfg_register_string("peername", "", nullptr, "");
+ xbt_cfg_register_string("user", "", nullptr, "");
} /* end_of_make_set */
XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
xbt_test_add("Access to a non-existant entry");
{
- xbt_ex_t e;
-
- TRY {
+ try {
xbt_cfg_set_parse("color:blue");
- } CATCH(e) {
+ } catch(xbt_ex& e) {
if (e.category != not_found_error)
xbt_test_exception(e);
- xbt_ex_free(e);
}
}
xbt_cfg_free(&simgrid_config);
