#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)
{
// Get config
-template <class T> XBT_PUBLIC T const& get_value(const char* name);
+template <class T> XBT_PUBLIC T const& get_value(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>(std::string name);
+extern template XBT_PUBLIC double const& get_value<double>(std::string name);
+extern template XBT_PUBLIC bool const& get_value<bool>(std::string name);
+extern template XBT_PUBLIC std::string const& get_value<std::string>(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(std::string name, 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(std::string name, 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(std::string name, 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(std::string name, 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(std::string name, std::string description, std::string value,
std::function<void(std::string const&)> callback);
// ***** alias *****
found = true;
}
if (not found || std::string(val) == "help") {
- std::string mesg;
+ std::string mesg = std::string("\n");
if (std::string(val) == "help")
- mesg = std::string("\nPossible values for option ") + name + ":\n";
+ mesg += std::string("Possible values for option ") + name + ":\n";
else
- mesg = std::string("\nInvalid value '") + val + "' for option " + name + ". Possible values:\n";
+ mesg += std::string("Invalid 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";
value = std::move(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
+bind_flag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description,
+ std::map<T, std::string> valid_values, F callback)
+{
+ bind_flag(value, name, description, std::move(valid_values), std::move(callback));
+ alias(name, std::move(aliases));
+}
+
/** Bind a variable to configuration flag
*
* <pre><code>
template<class T>
class Flag {
T value_;
+ std::string name_;
+
public:
/** Constructor
* @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);
}
/* 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));
}
* 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, std::map<T, std::string> valid_values, F callback)
+ : value_(value), name_(name)
{
simgrid::config::bind_flag(value_, name, desc, std::move(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,
+ std::map<T, std::string> valid_values, F callback)
+ : value_(value), name_(name)
+ {
+ simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(valid_values), std::move(callback));
+ }
+
// No copy:
Flag(Flag const&) = delete;
Flag& operator=(Flag const&) = delete;
T& get() { return value_; }
T const& get() const { return value_; }
+ std::string get_name() const { return name_; }
// Implicit conversion to the underlying type:
operator T&() { return value_; }
operator T const&() const{ return value_; }
bool operator>=(U const& that) const { return value_ >= that; }
};
+XBT_PUBLIC void finalize();
+XBT_PUBLIC void show_aliases();
+XBT_PUBLIC void help();
}
}
XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::get_value<std::string>") XBT_PUBLIC std::string