X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3836e4e27a13a0d389812e41a4d5d651ff0c158b..f222c4a646c839d44049ae7fa0c4974ccbf96976:/include/xbt/config.hpp

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index d25e1c41ce..8df3f1ee08 100644
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -19,12 +19,13 @@
 #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)
 {
@@ -43,14 +44,37 @@ inline std::string to_string(std::string&& value)
   return std::move(value);
 }
 
+// Set default
+
+template <class T> XBT_PUBLIC void set_default(const char* name, T value);
+
+extern template XBT_PUBLIC void set_default<int>(const char* name, int value);
+extern template XBT_PUBLIC void set_default<double>(const char* name, double value);
+extern template XBT_PUBLIC void set_default<bool>(const char* name, bool value);
+extern template XBT_PUBLIC void set_default<std::string>(const char* name, std::string value);
+
+XBT_PUBLIC bool is_default(const char* name);
+
+// Set config
+
+template <class T> XBT_PUBLIC void set_value(const char* name, T value);
+
+extern template XBT_PUBLIC void set_value<int>(const char* name, int value);
+extern template XBT_PUBLIC void set_value<double>(const char* name, double value);
+extern template XBT_PUBLIC void set_value<bool>(const char* name, bool 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);
+
 // Get config
 
-template <class T> XBT_PUBLIC T const& getConfig(const char* name);
+template <class T> XBT_PUBLIC T const& get_value(std::string name);
 
-extern template XBT_PUBLIC int const& getConfig<int>(const char* name);
-extern template XBT_PUBLIC double const& getConfig<double>(const char* name);
-extern template XBT_PUBLIC bool const& getConfig<bool>(const char* name);
-extern template XBT_PUBLIC std::string const& getConfig<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:
 
@@ -62,17 +86,17 @@ extern template XBT_PUBLIC std::string const& getConfig<std::string>(const char*
  *  @param callback    called with the option value
  */
 template <class T>
-XBT_PUBLIC void declareFlag(const char* name, const char* description, T value,
-                            std::function<void(const T&)> callback = std::function<void(const T&)>());
-
-extern template XBT_PUBLIC void declareFlag(const char* name, const char* description, int value,
-                                            std::function<void(int const&)> callback);
-extern template XBT_PUBLIC void declareFlag(const char* name, const char* description, double value,
-                                            std::function<void(double const&)> callback);
-extern template XBT_PUBLIC void declareFlag(const char* name, const char* description, bool value,
-                                            std::function<void(bool const&)> callback);
-extern template XBT_PUBLIC void declareFlag(const char* name, const char* description, std::string value,
-                                            std::function<void(std::string const&)> callback);
+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(std::string name, std::string description, int value,
+                                             std::function<void(int const&)> callback);
+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(std::string name, std::string description, bool value,
+                                             std::function<void(bool const&)> callback);
+extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, std::string value,
+                                             std::function<void(std::string const&)> callback);
 
 // ***** alias *****
 
@@ -84,18 +108,15 @@ XBT_PUBLIC void alias(const char* realname, std::initializer_list<const char*> a
  *  @param name  Flag name
  *  @param description Option description
  */
-template<class T>
-void bindFlag(T& value, const char* name, const char* description)
+template <class T> void bind_flag(T& value, const char* name, const char* description)
 {
-  declareFlag<T>(name, description, value, [&value](T const& val) {
-    value = val;
-  });
+  declare_flag<T>(name, description, value, [&value](T const& val) { value = val; });
 }
 
 template <class T>
-void bindFlag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description)
+void bind_flag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description)
 {
-  bindFlag(value, name, description);
+  bind_flag(value, name, description);
   alias(name, std::move(aliases));
 }
 
@@ -103,7 +124,7 @@ void bindFlag(T& value, const char* name, std::initializer_list<const char*> ali
  *
  *  <pre><code>
  *  static int x;
- *  simgrid::config::bindFlag(a, "x", [](int x) {
+ *  simgrid::config::bind_flag(a, "x", [](int x) {
  *    if (x < x_min || x => x_max)
  *      throw std::range_error("must be in [x_min, x_max)")
  *  });
@@ -112,69 +133,74 @@ void bindFlag(T& value, const char* name, std::initializer_list<const char*> ali
 // 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
-bindFlag(T& value, const char* name, const char* description, F callback)
+bind_flag(T& value, const char* name, const char* description, F callback)
 {
-  declareFlag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
-                callback(val);
-                value = std::move(val);
-              }));
+  declare_flag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
+                 callback(val);
+                 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
-bindFlag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description, F callback)
+bind_flag(T& value, const char* name, std::initializer_list<const char*> aliases, const char* description, F callback)
 {
-  bindFlag(value, name, description, std::move(callback));
+  bind_flag(value, name, description, std::move(callback));
   alias(name, std::move(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
-bindFlag(T& value, const char* name, const char* description, std::map<T, std::string> valid_values, F callback)
+bind_flag(T& value, const char* name, const char* description, std::map<T, std::string> valid_values, F callback)
+{
+  declare_flag(name, description, value,
+               std::function<void(const T&)>([&value, name, valid_values, callback](const T& val) {
+                 callback(val);
+                 bool found = false;
+                 for (auto kv : valid_values) {
+                   if (kv.first == val)
+                     found = true;
+                 }
+                 if (not found || std::string(val) == "help") {
+                   std::string mesg = std::string("\n");
+                   if (std::string(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 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);
+               }));
+}
+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)
 {
-  declareFlag(name, description, value,
-              std::function<void(const T&)>([&value, name, valid_values, callback](const T& val) {
-                callback(val);
-                bool found = false;
-                for (auto kv : valid_values) {
-                  if (kv.first == val)
-                    found = true;
-                }
-                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);
-              }));
+  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>
  *  static int x;
- *  simgrid::config::bindFlag(a, "x", [](int x) { return x > 0; });
+ *  simgrid::config::bind_flag(a, "x", [](int x) { return x > 0; });
  *  </code></pre>
  */
 // 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
-bindFlag(T& value, const char* name, const char* description,
-  F callback)
+template <class T, class F>
+typename std::enable_if<std::is_same<bool, decltype(std::declval<F>()(std::declval<const T&>()))>::value, void>::type
+bind_flag(T& value, const char* name, const char* description, F callback)
 {
-  declareFlag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
-                if (not callback(val))
-                  throw std::range_error("invalid value.");
-                value = std::move(val);
-              }));
+  declare_flag(name, description, value, std::function<void(const T&)>([&value, callback](const T& val) {
+                 if (not callback(val))
+                   throw std::range_error("invalid value.");
+                 value = std::move(val);
+               }));
 }
 
 /** A variable bound to a CLI option
@@ -188,6 +214,8 @@ bindFlag(T& value, const char* name, const char* description,
 template<class T>
 class Flag {
   T value_;
+  std::string name_;
+
 public:
 
   /** Constructor
@@ -196,33 +224,50 @@ public:
    *  @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::bindFlag(value_, name, desc);
+    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::bindFlag(value_, name, std::move(aliases), desc);
+    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::bindFlag(value_, name, desc, std::move(callback));
+    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), name_(name)
+  {
+    simgrid::config::bind_flag(value_, name, std::move(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, 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::bindFlag(value_, name, desc, std::move(valid_values), std::move(callback));
+    simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(valid_values), std::move(callback));
   }
 
   // No copy:
@@ -233,6 +278,7 @@ public:
   T& get() { return value_; }
   T const& get() const { return value_; }
 
+  std::string get_name() { return name_; }
   // Implicit conversion to the underlying type:
   operator T&() { return value_; }
   operator T const&() const{ return value_; }
@@ -256,8 +302,12 @@ public:
   bool operator>=(U const& that) const { return value_ >= that; }
 };
 
+XBT_PUBLIC void finalize();
+XBT_PUBLIC void show_aliases();
+XBT_PUBLIC void help();
 }
 }
-XBT_PUBLIC std::string xbt_cfg_get_string(const char* name);
+XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::get_value<std::string>") XBT_PUBLIC std::string
+    xbt_cfg_get_string(const char* name);
 
 #endif