[config] some declare_flag to Flag

[simgrid.git] / include / xbt / config.hpp

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 4430150..494d89c 100644 (file)
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2020. 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. */
@@ -132,7 +132,7 @@ void bind_flag(T& value, const char* name, std::initializer_list<const char*> al
  */
 // 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) {
@@ -142,7 +142,7 @@ bind_flag(T& value, const char* name, const char* description, F callback)
 }
 
 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));
@@ -150,8 +150,8 @@ bind_flag(T& value, const char* name, std::initializer_list<const char*> aliases
 }
 
 template <class F>
-typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const std::string&>()))>::value,
-                        void>::type
+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)
 {
@@ -159,7 +159,7 @@ bind_flag(std::string& value, const char* name, const char* description,
                std::function<void(const std::string&)>([&value, name, valid_values, callback](const std::string& val) {
                  callback(val);
                  if (valid_values.find(val) != valid_values.end()) {
-                   value = std::move(val);
+                   value = val;
                    return;
                  }
                  std::string mesg = "\n";
@@ -173,8 +173,8 @@ bind_flag(std::string& value, const char* name, const char* description,
                }));
 }
 template <class F>
-typename std::enable_if<std::is_same<void, decltype(std::declval<F>()(std::declval<const std::string&>()))>::value,
-                        void>::type
+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)
 {
@@ -191,7 +191,7 @@ bind_flag(std::string& value, const char* name, std::initializer_list<const char
  */
 // 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) {
@@ -204,9 +204,9 @@ bind_flag(T& value, const char* name, const char* description, F callback)
 /** 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>
@@ -256,7 +256,7 @@ public:
        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, desc, valid_values, std::move(callback));
   }
 
   /* A constructor with everything */
@@ -303,7 +303,24 @@ public:
 XBT_PUBLIC void finalize();
 XBT_PUBLIC void show_aliases();
 XBT_PUBLIC void help();
+
 } // namespace config
 } // namespace simgrid
 
+/******************************** Configuration of Simgrid **************************************/
+extern XBT_PUBLIC simgrid::config::Flag<int> _sg_context_stack_size;
+extern XBT_PUBLIC simgrid::config::Flag<int> _sg_context_guard_size;
+extern XBT_PUBLIC simgrid::config::Flag<int> _sg_context_nthreads;
+extern XBT_PUBLIC simgrid::config::Flag<std::string> _sg_context_synchro;
+
+extern XBT_PUBLIC simgrid::config::Flag<bool> _sg_cpu_maxmin_selective_update;
+
+extern XBT_PUBLIC simgrid::config::Flag<bool> _sg_bmf_selective_update;
+
+extern XBT_PUBLIC simgrid::config::Flag<double> _sg_network_loopback_bandwidth;
+extern XBT_PUBLIC simgrid::config::Flag<double> _sg_network_loopback_latency;
+extern XBT_PUBLIC simgrid::config::Flag<bool> _sg_network_maxmin_selective_update;
+
+extern XBT_PUBLIC simgrid::config::Flag<bool> _sg_execution_cutpath;
+
 #endif