Define simgrid::xbt::set_default<>.

[simgrid.git] / src / xbt / config.cpp

diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index a172a49..3f5be9a 100644 (file)
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -366,17 +366,41 @@ void Config::help()
   }
 }
 
   }
 }
 

-// ***** get_config *****
+// ***** set_default *****

 
 

-template <class T> XBT_PUBLIC T const& get_config(const char* name)
+template <class T> XBT_PUBLIC void set_default(const char* name, T value)
+{
+  (*simgrid_config)[name].set_default_value<T>(std::move(value));
+}
+
+template XBT_PUBLIC void set_default<int>(const char* name, int value);
+template XBT_PUBLIC void set_default<double>(const char* name, double value);
+template XBT_PUBLIC void set_default<bool>(const char* name, bool value);
+template XBT_PUBLIC void set_default<std::string>(const char* name, std::string value);
+
+// ***** set_value *****
+
+template <class T> XBT_PUBLIC void set_value(const char* name, T value)
+{
+  (*simgrid_config)[name].set_value<T>(std::move(value));
+}
+
+template XBT_PUBLIC void set_value<int>(const char* name, int value);
+template XBT_PUBLIC void set_value<double>(const char* name, double value);
+template XBT_PUBLIC void set_value<bool>(const char* name, bool value);
+template XBT_PUBLIC void set_value<std::string>(const char* name, std::string value);
+
+// ***** get_value *****
+
+template <class T> XBT_PUBLIC T const& get_value(const char* name)

 {
   return (*simgrid_config)[name].get_value<T>();
 }
 
 {
   return (*simgrid_config)[name].get_value<T>();
 }
 

-template XBT_PUBLIC int const& get_config<int>(const char* name);
-template XBT_PUBLIC double const& get_config<double>(const char* name);
-template XBT_PUBLIC bool const& get_config<bool>(const char* name);
-template XBT_PUBLIC std::string const& get_config<std::string>(const char* name);
+template XBT_PUBLIC int const& get_value<int>(const char* name);
+template XBT_PUBLIC double const& get_value<double>(const char* name);
+template XBT_PUBLIC bool const& get_value<bool>(const char* name);
+template XBT_PUBLIC std::string const& get_value<std::string>(const char* name);

 
 // ***** alias *****
 
 
 // ***** alias *****
 


@@ -386,24 +410,24 @@ void alias(const char* realname, std::initializer_list<const char*> aliases)
     simgrid_config->alias(realname, aliasname);
 }
 
     simgrid_config->alias(realname, aliasname);
 }
 

-// ***** declareFlag *****
+// ***** declare_flag *****

 
 template <class T>
 
 template <class T>

-XBT_PUBLIC void declareFlag(const char* name, const char* description, T value, std::function<void(const T&)> callback)
+XBT_PUBLIC void declare_flag(const char* name, const char* description, T value, std::function<void(const T&)> callback)

 {
   if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->register_option<T>(name, description, std::move(value), std::move(callback));
 }
 
 {
   if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->register_option<T>(name, description, std::move(value), std::move(callback));
 }
 

-template XBT_PUBLIC void declareFlag(const char* name, const char* description, int value,
-                                     std::function<void(int const&)> callback);
-template XBT_PUBLIC void declareFlag(const char* name, const char* description, double value,
-                                     std::function<void(double const&)> callback);
-template XBT_PUBLIC void declareFlag(const char* name, const char* description, bool value,
-                                     std::function<void(bool const&)> callback);
-template XBT_PUBLIC void declareFlag(const char* name, const char* description, std::string value,
-                                     std::function<void(std::string const&)> callback);
+template XBT_PUBLIC void declare_flag(const char* name, const char* description, int value,
+                                      std::function<void(int const&)> callback);
+template XBT_PUBLIC void declare_flag(const char* name, const char* description, double value,
+                                      std::function<void(double const&)> callback);
+template XBT_PUBLIC void declare_flag(const char* name, const char* description, bool value,
+                                      std::function<void(bool const&)> callback);
+template XBT_PUBLIC void declare_flag(const char* name, const char* description, std::string value,
+                                      std::function<void(std::string const&)> callback);

 }
 }
 
 }
 }
 


@@ -684,9 +708,9 @@ static void make_set()
 {
   simgrid_config = nullptr;
   xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
 {
   simgrid_config = nullptr;
   xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);

-  simgrid::config::declareFlag<int>("speed", "description", 0);
-  simgrid::config::declareFlag<std::string>("peername", "description", "");
-  simgrid::config::declareFlag<std::string>("user", "description", "");
+  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")
 }                               /* end_of_make_set */
 
 XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")


@@ -707,7 +731,7 @@ XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
   {
     /* get_single_value */
     xbt_cfg_set_parse("peername:toto:42 speed:42");
   {
     /* get_single_value */
     xbt_cfg_set_parse("peername:toto:42 speed:42");

-    int ival = xbt_cfg_get_int("speed");
+    int ival = simgrid::config::get_value<int>("speed");

     if (ival != 42)
       xbt_test_fail("Speed value = %d, I expected 42", ival);
   }
     if (ival != 42)
       xbt_test_fail("Speed value = %d, I expected 42", ival);
   }