namespace simgrid {
namespace config {
-missing_key_error::~missing_key_error() = default;
-
namespace {
const char* true_values[] = {
{
this->content = std::move(value);
this->update();
+ this->unsetDefault();
}
void setDefaultValue(T value)
bool warn_for_aliases = true;
public:
- Config() = default;
+ Config();
~Config();
// No copy:
ConfigurationElement* getDictElement(const char* name);
};
+Config::Config()
+{
+ atexit(&sg_config_finalize);
+}
Config::~Config()
{
XBT_DEBUG("Frees cfg set %p", this);
XBT_INFO("Option %s has been renamed to %s. Consider switching.", name, res->getKey().c_str());
return res;
} else {
- throw simgrid::config::missing_key_error(std::string("Bad config key: ") + name);
+ THROWF(not_found_error, 0, "Bad config key: %s", name);
}
}
}
fflush(stdout);
}
-/** @brief Displays the declared aliases and their description */
+/** @brief Displays the declared aliases and their replacement */
void Config::showAliases()
{
- 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);
+ printf(" %-40s %s\n", elm.first.c_str(), elm.second->getKey().c_str());
}
/** @brief Displays the declared options and their description */
// ***** alias *****
-void alias(const char* realname, const char* aliasname)
+void alias(const char* realname, std::initializer_list<const char*> aliases)
{
- simgrid_config->alias(realname, aliasname);
+ for (auto const& aliasname : aliases)
+ simgrid_config->alias(realname, aliasname);
}
// ***** declareFlag *****
xbt_cfg_t xbt_cfg_new()
{
- atexit(&sg_config_finalize);
return new simgrid::config::Config();
}
void xbt_cfg_free(xbt_cfg_t * cfg) { delete *cfg; }
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.c_str()].setStringValue(val.c_str());
- }
- catch (simgrid::config::missing_key_error& e) {
- goto on_missing_key;
- }
- catch (...) {
- goto on_exception;
- }
+ (*simgrid_config)[name.c_str()].setStringValue(val.c_str());
}
- return;
-
- /* Do not THROWF from a C++ exception catching context, or some cleanups will be missing */
-on_missing_key:
- THROWF(not_found_error, 0, "Could not set variables %s", options);
-on_exception:
- THROWF(unknown_error, 0, "Could not set variables %s", options);
}
-// Horrible mess to translate C++ exceptions to C exceptions:
-// 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(); }
-
/** @brief Set the value of a variable, using the string representation of that value
*
* @param key name of the variable to modify
void xbt_cfg_set_as_string(const char *key, const char *value)
{
- try {
- (*simgrid_config)[key].setStringValue(value);
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s as string %s", key, value);
+ (*simgrid_config)[key].setStringValue(value);
}
/** @brief Set an integer value to \a name within \a cfg if it wasn't changed yet
*/
void xbt_cfg_setdefault_int(const char *key, int value)
{
- try {
- (*simgrid_config)[key].setDefaultValue<int>(value);
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to default integer %i", key, value);
+ (*simgrid_config)[key].setDefaultValue<int>(value);
}
/** @brief Set an integer value to \a name within \a cfg if it wasn't changed yet
*/
void xbt_cfg_setdefault_double(const char *key, double value)
{
- try {
- (*simgrid_config)[key].setDefaultValue<double>(value);
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to default double %f", key, value);
+ (*simgrid_config)[key].setDefaultValue<double>(value);
}
/** @brief Set a string value to \a name within \a cfg if it wasn't changed yet
*/
void xbt_cfg_setdefault_string(const char *key, const char *value)
{
- try {
- (*simgrid_config)[key].setDefaultValue<std::string>(value ? value : "");
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to default string %s", key, value);
+ (*simgrid_config)[key].setDefaultValue<std::string>(value ? value : "");
}
/** @brief Set an boolean value to \a name within \a cfg if it wasn't changed yet
*/
void xbt_cfg_setdefault_boolean(const char *key, const char *value)
{
- try {
- (*simgrid_config)[key].setDefaultValue<bool>(simgrid::config::parseBool(value));
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to default boolean %s", key, value);
+ (*simgrid_config)[key].setDefaultValue<bool>(simgrid::config::parseBool(value));
}
/** @brief Set an integer value to \a name within \a cfg
*/
void xbt_cfg_set_int(const char *key, int value)
{
- try {
- (*simgrid_config)[key].setValue<int>(value);
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to integer %i", key, value);
+ (*simgrid_config)[key].setValue<int>(value);
}
/** @brief Set or add a double value to \a name within \a cfg
*/
void xbt_cfg_set_double(const char *key, double value)
{
- try {
- (*simgrid_config)[key].setValue<double>(value);
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to double %f", key, value);
+ (*simgrid_config)[key].setValue<double>(value);
}
/** @brief Set or add a string value to \a name within \a cfg
*/
void xbt_cfg_set_string(const char* key, const char* value)
{
- try {
- (*simgrid_config)[key].setValue<std::string>(value);
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to string %s", key, value);
+ (*simgrid_config)[key].setValue<std::string>(value);
}
/** @brief Set or add a boolean value to \a name within \a cfg
*/
void xbt_cfg_set_boolean(const char *key, const char *value)
{
- try {
- (*simgrid_config)[key].setValue<bool>(simgrid::config::parseBool(value));
- return;
- }
- TRANSLATE_EXCEPTIONS("Could not set variable %s to boolean %s", key, value);
+ (*simgrid_config)[key].setValue<bool>(simgrid::config::parseBool(value));
}
/* Say if the value is the default value */
int xbt_cfg_is_default_value(const char *key)
{
- try {
- return (*simgrid_config)[key].isDefault() ? 1 : 0;
- }
- TRANSLATE_EXCEPTIONS("Could not get variable %s", key);
+ return (*simgrid_config)[key].isDefault() ? 1 : 0;
}
/*----[ Getting ]---------------------------------------------------------*/
*/
int xbt_cfg_get_int(const char *key)
{
- try {
- return (*simgrid_config)[key].getValue<int>();
- }
- TRANSLATE_EXCEPTIONS("Could not get variable %s", key);
+ return (*simgrid_config)[key].getValue<int>();
}
/** @brief Retrieve a double value of a variable (get a warning if not uniq)
*/
double xbt_cfg_get_double(const char *key)
{
- try {
- return (*simgrid_config)[key].getValue<double>();
- }
- TRANSLATE_EXCEPTIONS("Could not get variable %s", key);
+ return (*simgrid_config)[key].getValue<double>();
}
/** @brief Retrieve a string value of a variable (get a warning if not uniq)
*/
std::string xbt_cfg_get_string(const char* key)
{
- try {
- return (*simgrid_config)[key].getValue<std::string>();
- }
- TRANSLATE_EXCEPTIONS("Could not get variable %s", key);
+ return (*simgrid_config)[key].getValue<std::string>();
}
/** @brief Retrieve a boolean value of a variable (get a warning if not uniq)
*/
int xbt_cfg_get_boolean(const char *key)
{
- try {
- return (*simgrid_config)[key].getValue<bool>() ? 1 : 0;
- }
- TRANSLATE_EXCEPTIONS("Could not get variable %s", key);
+ return (*simgrid_config)[key].getValue<bool>() ? 1 : 0;
}
#ifdef SIMGRID_TEST
{
simgrid_config = nullptr;
xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
- xbt_cfg_register_int("speed", 0, nullptr, "");
- xbt_cfg_register_string("peername", "", nullptr, "");
- xbt_cfg_register_string("user", "", nullptr, "");
+ simgrid::config::declareFlag<int>("speed", "description", 0);
+ simgrid::config::declareFlag<std::string>("peername", "description", "");
+ simgrid::config::declareFlag<std::string>("user", "description", "");
} /* end_of_make_set */
XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")