-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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. */
/* Callback */
xbt_cfg_cb_t old_callback = nullptr;
- ConfigurationElement(std::string key, std::string desc) : key(key), desc(desc) {}
- ConfigurationElement(std::string key, std::string desc, xbt_cfg_cb_t cb) : key(key), desc(desc), old_callback(cb) {}
+ ConfigurationElement(std::string key, std::string desc) : key(std::move(key)), desc(std::move(desc)) {}
+ ConfigurationElement(std::string key, std::string desc, xbt_cfg_cb_t cb)
+ : key(std::move(key)), desc(std::move(desc)), old_callback(cb)
+ {
+ }
virtual ~ConfigurationElement() = default;
template <class T> T const& get_value() const
{
- return dynamic_cast<const TypedConfigurationElement<T>&>(*this).get_value();
+ return static_cast<const TypedConfigurationElement<T>&>(*this).get_value();
}
template <class T> void set_value(T value)
{
- dynamic_cast<TypedConfigurationElement<T>&>(*this).set_value(std::move(value));
+ static_cast<TypedConfigurationElement<T>&>(*this).set_value(std::move(value));
}
template <class T> void set_default_value(T value)
{
- dynamic_cast<TypedConfigurationElement<T>&>(*this).set_default_value(std::move(value));
+ static_cast<TypedConfigurationElement<T>&>(*this).set_default_value(std::move(value));
}
void unset_default() { isdefault = false; }
bool is_default() const { return isdefault; }
public:
TypedConfigurationElement(std::string key, std::string desc, T value = T())
- : ConfigurationElement(key, desc), content(std::move(value))
+ : ConfigurationElement(std::move(key), std::move(desc)), content(std::move(value))
{}
TypedConfigurationElement(std::string key, std::string desc, T value, xbt_cfg_cb_t cb)
- : ConfigurationElement(key, desc, cb), content(std::move(value))
+ : ConfigurationElement(std::move(key), std::move(desc), cb), content(std::move(value))
{}
TypedConfigurationElement(std::string key, std::string desc, T value, std::function<void(T&)> callback)
- : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback))
+ : ConfigurationElement(std::move(key), std::move(desc)), content(std::move(value)), callback(std::move(callback))
{}
~TypedConfigurationElement() = default;
Config(Config const&) = delete;
Config& operator=(Config const&) = delete;
- ConfigurationElement& operator[](std::string name);
- void alias(std::string realname, std::string aliasname);
+ ConfigurationElement& operator[](const std::string& name);
+ void alias(const std::string& realname, const std::string& aliasname);
template <class T, class... A>
- simgrid::config::TypedConfigurationElement<T>* register_option(std::string name, A&&... a)
+ simgrid::config::TypedConfigurationElement<T>* 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());
void help();
protected:
- ConfigurationElement* get_dict_element(std::string name);
+ ConfigurationElement* get_dict_element(const std::string& name);
};
Config::Config()
delete elm.second;
}
-inline ConfigurationElement* Config::get_dict_element(std::string name)
+inline ConfigurationElement* Config::get_dict_element(const std::string& name)
{
auto opt = options.find(name);
if (opt != options.end()) {
}
}
-inline ConfigurationElement& Config::operator[](std::string name)
+inline ConfigurationElement& Config::operator[](const std::string& name)
{
return *(get_dict_element(name));
}
-void Config::alias(std::string realname, std::string aliasname)
+void Config::alias(const std::string& realname, const std::string& aliasname)
{
xbt_assert(aliases.find(aliasname) == aliases.end(), "Alias '%s' already.", aliasname.c_str());
ConfigurationElement* element = this->get_dict_element(realname);
// ***** get_value *****
-template <class T> XBT_PUBLIC T const& get_value(std::string name)
+template <class T> XBT_PUBLIC T const& get_value(const std::string& name)
{
return (*simgrid_config)[name].get_value<T>();
}
-template XBT_PUBLIC int const& get_value<int>(std::string name);
-template XBT_PUBLIC double const& get_value<double>(std::string name);
-template XBT_PUBLIC bool const& get_value<bool>(std::string name);
-template XBT_PUBLIC std::string const& get_value<std::string>(std::string name);
+template XBT_PUBLIC int const& get_value<int>(const std::string& name);
+template XBT_PUBLIC double const& get_value<double>(const std::string& name);
+template XBT_PUBLIC bool const& get_value<bool>(const std::string& name);
+template XBT_PUBLIC std::string const& get_value<std::string>(const std::string& name);
// ***** alias *****
// ***** declare_flag *****
template <class T>
-XBT_PUBLIC void declare_flag(std::string name, std::string description, T value, std::function<void(const T&)> callback)
+XBT_PUBLIC void declare_flag(const std::string& name, std::string description, T value,
+ std::function<void(const T&)> callback)
{
if (simgrid_config == nullptr)
simgrid_config = new simgrid::config::Config();
- simgrid_config->register_option<T>(name, description, std::move(value), std::move(callback));
+ simgrid_config->register_option<T>(name, std::move(description), std::move(value), std::move(callback));
}
-template XBT_PUBLIC void declare_flag(std::string name, std::string description, int value,
+template XBT_PUBLIC void declare_flag(const std::string& name, std::string description, int value,
std::function<void(int const&)> callback);
-template XBT_PUBLIC void declare_flag(std::string name, std::string description, double value,
+template XBT_PUBLIC void declare_flag(const std::string& name, std::string description, double value,
std::function<void(double const&)> callback);
-template XBT_PUBLIC void declare_flag(std::string name, std::string description, bool value,
+template XBT_PUBLIC void declare_flag(const std::string& name, std::string description, bool value,
std::function<void(bool const&)> callback);
-template XBT_PUBLIC void declare_flag(std::string name, std::string description, std::string value,
+template XBT_PUBLIC void declare_flag(const std::string& name, std::string description, std::string value,
std::function<void(std::string const&)> callback);
void finalize()
{
return (*simgrid_config)[key].get_value<bool>() ? 1 : 0;
}
-
-#ifdef SIMGRID_TEST
-
-#include <string>
-
-#include "simgrid/Exception.hpp"
-#include "xbt.h"
-#include "xbt/ex.h"
-
-#include <xbt/config.hpp>
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg);
-
-XBT_TEST_SUITE("config", "Configuration support");
-
-XBT_PUBLIC_DATA simgrid::config::Config* simgrid_config;
-
-static void make_set()
-{
- simgrid_config = nullptr;
- xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
- simgrid::config::declare_flag<int>("speed", "description", 0);
- simgrid::config::declare_flag<std::string>("peername", "description", "");
- simgrid::config::declare_flag<std::string>("user", "description", "");
-} /* end_of_make_set */
-
-XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
-{
- auto temp = simgrid_config;
- make_set();
- xbt_test_add("Alloc and free a config set");
- simgrid::config::set_parse("peername:veloce user:bidule");
- simgrid::config::finalize();
- simgrid_config = temp;
-}
-
-XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
-{
- auto temp = simgrid_config;
- make_set();
- xbt_test_add("Get a single value");
- {
- /* get_single_value */
- simgrid::config::set_parse("peername:toto:42 speed:42");
- int ival = simgrid::config::get_value<int>("speed");
- if (ival != 42)
- xbt_test_fail("Speed value = %d, I expected 42", ival);
- }
-
- xbt_test_add("Access to a non-existant entry");
- {
- try {
- simgrid::config::set_parse("color:blue");
- } catch(xbt_ex& e) {
- if (e.category != not_found_error)
- xbt_test_exception(e);
- }
- }
- simgrid::config::finalize();
- simgrid_config = temp;
-}
-
-XBT_TEST_UNIT("c++flags", test_config_cxx_flags, "C++ flags")
-{
- auto temp = simgrid_config;
- make_set();
- xbt_test_add("C++ declaration of flags");
-
- simgrid::config::Flag<int> int_flag("int", "", 0);
- simgrid::config::Flag<std::string> string_flag("string", "", "foo");
- simgrid::config::Flag<double> double_flag("double", "", 0.32);
- simgrid::config::Flag<bool> bool_flag1("bool1", "", false);
- simgrid::config::Flag<bool> bool_flag2("bool2", "", true);
-
- xbt_test_add("Parse values");
- simgrid::config::set_parse("int:42 string:bar double:8.0 bool1:true bool2:false");
- xbt_test_assert(int_flag == 42, "Check int flag");
- xbt_test_assert(string_flag == "bar", "Check string flag");
- xbt_test_assert(double_flag == 8.0, "Check double flag");
- xbt_test_assert(bool_flag1, "Check bool1 flag");
- xbt_test_assert(not bool_flag2, "Check bool2 flag");
-
- simgrid::config::finalize();
- simgrid_config = temp;
-}
-
-#endif /* SIMGRID_TEST */
