-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. 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. */
#include <stdexcept>
#include <string>
#include <string>
-#include <type_traits>
-#include <typeinfo>
#include <vector>
#include "simgrid/Exception.hpp"
namespace {
-static bool parse_bool(const char* value)
+bool parse_bool(const char* value)
{
for (const char* true_value : {"yes", "on", "true", "1"})
if (std::strcmp(true_value, value) == 0)
throw std::range_error("not a boolean");
}
-static double parse_double(const char* value)
+double parse_double(const char* value)
{
char* end;
errno = 0;
double res = std::strtod(value, &end);
if (errno == ERANGE)
throw std::range_error("out of range");
- else if (errno)
- xbt_die("Unexpected errno");
+ xbt_assert(errno == 0, "Unexpected errno: %d", errno);
if (end == value || *end != '\0')
throw std::range_error("invalid double");
- else
- return res;
+ return res;
}
-static long int parse_long(const char* value)
+long int parse_long(const char* value)
{
char* end;
errno = 0;
long int res = std::strtol(value, &end, 0);
- if (errno) {
- if (res == LONG_MIN && errno == ERANGE)
- throw std::range_error("underflow");
- else if (res == LONG_MAX && errno == ERANGE)
- throw std::range_error("overflow");
- xbt_die("Unexpected errno");
- }
+ if (errno == ERANGE)
+ throw std::range_error(res == LONG_MIN ? "underflow" : "overflow");
+ xbt_assert(errno == 0, "Unexpected errno: %d", errno);
if (end == value || *end != '\0')
throw std::range_error("invalid integer");
- else
- return res;
+ return res;
}
// ***** ConfigType *****
TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function<void(T&)> callback)
: ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback))
{}
- ~TypedConfigurationElement() override = default;
std::string get_string_value() override;
const char* get_type_name() override;
this->update();
} else {
XBT_DEBUG("Do not override configuration variable '%s' with value '%s' because it was already set.",
- get_key().c_str(), to_string(value).c_str());
+ get_key().c_str(), get_string_value().c_str());
}
}
};
return to_string(content);
}
+template <> std::string TypedConfigurationElement<double>::get_string_value() // override
+{
+ // don't want std::to_string which uses %f, and formats very small values as 0.000000
+ return xbt::string_printf("%g", content);
+}
+
template <class T> void TypedConfigurationElement<T>::set_string_value(const char* value) // override
{
this->content = ConfigType<T>::parse(value);
class Config {
private:
// name -> ConfigElement:
- std::map<std::string, std::unique_ptr<ConfigurationElement>> options;
+ std::map<std::string, std::unique_ptr<ConfigurationElement>, std::less<>> options;
// alias -> ConfigElement from options:
- std::map<std::string, ConfigurationElement*> aliases;
+ std::map<std::string, ConfigurationElement*, std::less<>> aliases;
bool warn_for_aliases = true;
public:
return variable;
}
- // Debug:
- void dump(const char* name, const char* indent) const;
void show_aliases() const;
void help() const;
XBT_INFO("Option %s has been renamed to %s. Consider switching.", name.c_str(), res->get_key().c_str());
return res;
} else {
- std::string msg = "Bad config key: " + name + "\nExisting config keys:\n";
+ std::string msg = "Bad config key: " + name + "\n";
+ std::string kebab = name;
+ std::replace(begin(kebab), end(kebab), '_', '-'); // convert from snake_case to kebab-case
+ if (options.count(kebab) > 0)
+ msg += "Did you mean '" + kebab + "'?\n";
+ msg += "Existing 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);
xbt_assert(aliases.find(aliasname) == aliases.end(), "Alias '%s' already.", aliasname.c_str());
ConfigurationElement* element = this->get_dict_element(realname);
xbt_assert(element, "Cannot define an alias to the non-existing option '%s'.", realname.c_str());
- this->aliases.insert({aliasname, element});
-}
-
-/** @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) const
-{
- if (name)
- XBT_CVERB(xbt_help, "%s>> Dumping of the config set '%s':", indent, name);
-
- for (auto const& elm : options)
- XBT_CVERB(xbt_help, "%s %s: ()%s) %s", indent, elm.first.c_str(), elm.second->get_type_name(),
- elm.second->get_string_value().c_str());
-
- if (name)
- XBT_CVERB(xbt_help, "%s<< End of the config set '%s'", indent, name);
+ this->aliases.try_emplace(aliasname, element);
}
/** @brief Displays the declared aliases and their replacement */
