-/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-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 <utility>
#include <xbt/base.h>
-#include <xbt/config.h>
#include <xbt/sysdep.h>
namespace simgrid {
namespace config {
+class Config;
+
template<class T> inline
std::string to_string(T&& value)
{
extern template XBT_PUBLIC void set_value<std::string>(const char* name, std::string value);
XBT_PUBLIC void set_as_string(const char* name, const std::string& value);
-XBT_PUBLIC void set_parse(std::string options);
+XBT_PUBLIC void set_parse(const std::string& options);
// Get config
-template <class T> XBT_PUBLIC T const& get_value(const char* name);
+template <class T> XBT_PUBLIC T const& get_value(const std::string& name);
-extern template XBT_PUBLIC int const& get_value<int>(const char* name);
-extern template XBT_PUBLIC double const& get_value<double>(const char* name);
-extern template XBT_PUBLIC bool const& get_value<bool>(const char* name);
-extern template XBT_PUBLIC std::string const& get_value<std::string>(const char* name);
+extern template XBT_PUBLIC int const& get_value<int>(const std::string& name);
+extern template XBT_PUBLIC double const& get_value<double>(const std::string& name);
+extern template XBT_PUBLIC bool const& get_value<bool>(const std::string& name);
+extern template XBT_PUBLIC std::string const& get_value<std::string>(const std::string& name);
// Register:
* @param callback called with the option value
*/
template <class T>
-XBT_PUBLIC void declare_flag(const char* name, const char* description, T value,
+XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, T value,
std::function<void(const T&)> callback = std::function<void(const T&)>());
-extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, int value,
+extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, int value,
std::function<void(int const&)> callback);
-extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, double value,
+extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, double value,
std::function<void(double const&)> callback);
-extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, bool value,
+extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, bool value,
std::function<void(bool const&)> callback);
-extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, std::string value,
+extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, std::string value,
std::function<void(std::string const&)> callback);
// ***** alias *****
void bind_flag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description)
{
bind_flag(value, name, description);
- alias(name, std::move(aliases));
+ alias(name, aliases);
}
/** Bind a variable to configuration flag
*/
// F is a checker, F : T& -> ()
template <class T, class F>
-typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+typename std::enable_if_t<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>
bind_flag(T& value, const char* name, const char* description, F callback)
{
declare_flag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
}
template <class T, class F>
-typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+typename std::enable_if_t<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>
bind_flag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description, F callback)
{
bind_flag(value, name, description, std::move(callback));
- alias(name, std::move(aliases));
+ alias(name, aliases);
}
-template <class T, class F>
-typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
-bind_flag(T& value, const char* name, const char* description, std::map<T, std::string> valid_values, F callback)
+template <class F>
+typename std::enable_if_t<std::is_same<void, decltype(std::declval<F>()(std::declval<const std::string&>()))>::value,
+ void>
+bind_flag(std::string& value, const char* name, const char* description,
+ const std::map<std::string, std::string, std::less<>>& valid_values, F callback)
{
declare_flag(name, description, value,
- std::function<void(const T&)>([&value, name, valid_values, callback](const T& val) {
+ std::function<void(const std::string&)>([&value, name, valid_values, callback](const std::string& val) {
callback(val);
- bool found = false;
- for (auto kv : valid_values) {
- if (kv.first == val)
- found = true;
+ if (valid_values.find(val) != valid_values.end()) {
+ value = val;
+ return;
}
- if (not found || std::string(val) == "help") {
- std::string mesg;
- if (std::string(val) == "help")
- mesg = std::string("\nPossible values for option ") + name + ":\n";
- else
- mesg = std::string("\nInvalid value '") + val + "' for option " + name + ". Possible values:\n";
- for (auto kv : valid_values)
- mesg += " - '" + std::string(kv.first) + "': " + kv.second +
- (kv.first == value ? " <=== DEFAULT" : "") + "\n";
- xbt_die("%s", mesg.c_str());
- }
- value = std::move(val);
+ std::string mesg = "\n";
+ if (val == "help")
+ mesg += std::string("Possible values for option ") + name + ":\n";
+ else
+ mesg += std::string("Invalid value '") + val + "' for option " + name + ". Possible values:\n";
+ for (auto const& kv : valid_values)
+ mesg += " - '" + kv.first + "': " + kv.second + (kv.first == value ? " <=== DEFAULT" : "") + "\n";
+ xbt_die("%s", mesg.c_str());
}));
}
+template <class F>
+typename std::enable_if_t<std::is_same<void, decltype(std::declval<F>()(std::declval<const std::string&>()))>::value,
+ void>
+bind_flag(std::string& value, const char* name, std::initializer_list<const char*> aliases, const char* description,
+ const std::map<std::string, std::string, std::less<>>& valid_values, F callback)
+{
+ bind_flag(value, name, description, valid_values, std::move(callback));
+ alias(name, aliases);
+}
+
/** Bind a variable to configuration flag
*
* <pre><code>
*/
// F is a predicate, F : T const& -> bool
template <class T, class F>
-typename std::enable_if<std::is_same<bool, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+typename std::enable_if_t<std::is_same<bool, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>
bind_flag(T& value, const char* name, const char* description, F callback)
{
declare_flag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
/** A variable bound to a CLI option
*
* <pre><code>
- * static simgrid::config::flag<int> answer("answer", "Expected answer", 42);
- * static simgrid::config::flag<std::string> name("name", "Ford Perfect", "John Doe");
- * static simgrid::config::flag<double> gamma("gamma", "Gamma factor", 1.987);
+ * static simgrid::config::Flag<int> answer("answer", "Expected answer", 42);
+ * static simgrid::config::Flag<std::string> name("name", "Ford Perfect", "John Doe");
+ * static simgrid::config::Flag<double> gamma("gamma", "Gamma factor", 1.987);
* </code></pre>
*/
template<class T>
class Flag {
T value_;
-public:
+ std::string name_;
+public:
/** Constructor
*
* @param name Flag name
* @param desc Flag description
* @param value Flag initial/default value
*/
- Flag(const char* name, const char* desc, T value) : value_(value)
+ Flag(const char* name, const char* desc, T value) : value_(value), name_(name)
{
simgrid::config::bind_flag(value_, name, desc);
}
/** Constructor taking also an array of aliases for name */
- Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value) : value_(value)
+ Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value)
+ : value_(value), name_(name)
{
- simgrid::config::bind_flag(value_, name, std::move(aliases), desc);
+ simgrid::config::bind_flag(value_, name, aliases, desc);
}
/* A constructor accepting a callback that will be passed the parameter.
* It can either return a boolean (informing whether the parameter is valid), or returning void.
*/
- template<class F>
- Flag(const char* name, const char* desc, T value, F callback) : value_(value)
+ template <class F> Flag(const char* name, const char* desc, T value, F callback) : value_(value), name_(name)
{
simgrid::config::bind_flag(value_, name, desc, std::move(callback));
}
template <class F>
Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value, F callback)
- : value_(value)
+ : value_(value), name_(name)
{
- simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(callback));
+ simgrid::config::bind_flag(value_, name, aliases, desc, std::move(callback));
}
/* A constructor accepting a map of valid values -> their description,
* and producing an informative error message when an invalid value is passed, or when help is passed as a value.
*/
template <class F>
- Flag(const char* name, const char* desc, T value, std::map<T, std::string> valid_values, F callback) : value_(value)
+ Flag(const char* name, const char* desc, T value, const std::map<std::string, std::string, std::less<>>& valid_values,
+ F callback)
+ : value_(value), name_(name)
+ {
+ simgrid::config::bind_flag(value_, name, desc, valid_values, std::move(callback));
+ }
+
+ /* A constructor with everything */
+ template <class F>
+ Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value,
+ const std::map<std::string, std::string, std::less<>>& valid_values, F callback)
+ : value_(value), name_(name)
{
- simgrid::config::bind_flag(value_, name, desc, std::move(valid_values), std::move(callback));
+ simgrid::config::bind_flag(value_, name, aliases, desc, valid_values, std::move(callback));
}
// No copy:
T& get() { return value_; }
T const& get() const { return value_; }
+ const std::string& get_name() const { return name_; }
// Implicit conversion to the underlying type:
operator T&() { return value_; }
operator T const&() const{ return value_; }
template<class U>
Flag& operator=(U const& that) { value_ = that; return *this; }
template<class U>
- Flag& operator=(U && that) { value_ = that; return *this; }
+ Flag& operator=(U&& that) { value_ = std::forward<U>(that); return *this; }
template<class U>
bool operator==(U const& that) const { return value_ == that; }
template<class U>
bool operator>=(U const& that) const { return value_ >= that; }
};
-}
-}
-XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::get_value<std::string>") XBT_PUBLIC std::string
- xbt_cfg_get_string(const char* name);
+XBT_PUBLIC void finalize();
+XBT_PUBLIC void show_aliases();
+XBT_PUBLIC void help();
+
+} // namespace config
+} // namespace simgrid
#endif