X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a9b604048c4568bb2c2709f3b824da719a7e737..5ee23970780a802b53a76ca272464a462223e7e8:/src/xbt/config.cpp

diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index b705a39410..b2210e3923 100644
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -1,5 +1,7 @@
-/* Copyright (c) 2004-2014,2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2014,2016. 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 <stdio.h>
 
@@ -26,7 +28,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
 
-XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = NULL;
+XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = nullptr;
 
 namespace simgrid {
 namespace config {
@@ -289,7 +291,7 @@ public:
               name,
               variable->getDescription().c_str(),
               variable->getTypeName(), variable, this);
-    xbt_dict_set(this->options, name, variable, NULL);
+    xbt_dict_set(this->options, name, variable, nullptr);
     variable->update();
     return variable;
   }
@@ -312,7 +314,7 @@ static void xbt_cfgelm_free(void *data)
 
 Config::Config() :
   options(xbt_dict_new_homogeneous(xbt_cfgelm_free)),
-  aliases(xbt_dict_new_homogeneous(NULL))
+  aliases(xbt_dict_new_homogeneous(nullptr))
 {}
 
 Config::~Config()
@@ -350,7 +352,7 @@ void Config::alias(const char* realname, const char* aliasname)
   xbt_assert(this->getDictElement(aliasname) == nullptr, "Alias '%s' already.", aliasname);
   xbt_dictelm_t element = this->getDictElement(realname);
   xbt_assert(element, "Cannot define an alias to the non-existing option '%s'.", realname);
-  xbt_dict_set(this->aliases, aliasname, element, NULL);
+  xbt_dict_set(this->aliases, aliasname, element, nullptr);
 }
 
 /** @brief Dump a config set for debuging purpose
@@ -361,9 +363,9 @@ void Config::alias(const char* realname, const char* aliasname)
 void Config::dump(const char *name, const char *indent)
 {
   xbt_dict_t dict = this->options;
-  xbt_dict_cursor_t cursor = NULL;
-  simgrid::config::ConfigurationElement* variable = NULL;
-  char *key = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
+  simgrid::config::ConfigurationElement* variable = nullptr;
+  char *key = nullptr;
 
   if (name)
     printf("%s>> Dumping of the config set '%s':\n", indent, name);
@@ -387,7 +389,7 @@ void Config::showAliases()
   unsigned int dynar_cursor;
   xbt_dictelm_t dictel;
   char *name;
-  xbt_dynar_t names = xbt_dynar_new(sizeof(char *), NULL);
+  xbt_dynar_t names = xbt_dynar_new(sizeof(char *), nullptr);
 
   xbt_dict_foreach(this->aliases, dict_cursor, name, dictel)
     xbt_dynar_push(names, &name);
@@ -404,7 +406,7 @@ void Config::help()
   unsigned int dynar_cursor;
   simgrid::config::ConfigurationElement* variable;
   char *name;
-  xbt_dynar_t names = xbt_dynar_new(sizeof(char *), NULL);
+  xbt_dynar_t names = xbt_dynar_new(sizeof(char *), nullptr);
 
   xbt_dict_foreach(this->options, dict_cursor, name, variable)
     xbt_dynar_push(names, &name);
@@ -445,7 +447,7 @@ template<class T>
 XBT_PUBLIC(void) declareFlag(const char* name, const char* description,
   T value, std::function<void(const T&)> callback)
 {
-  if (simgrid_config == NULL)
+  if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->registerOption<T>(
     name, description, std::move(value), std::move(callback));
@@ -478,21 +480,21 @@ void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
 void xbt_cfg_register_double(const char *name, double default_value,
   xbt_cfg_cb_t cb_set, const char *desc)
 {
-  if (simgrid_config == NULL)
+  if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->registerOption<double>(name, desc, default_value, cb_set);
 }
 
 void xbt_cfg_register_int(const char *name, int default_value,xbt_cfg_cb_t cb_set, const char *desc)
 {
-  if (simgrid_config == NULL)
+  if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->registerOption<int>(name, desc, default_value, cb_set);
 }
 
 void xbt_cfg_register_string(const char *name, const char *default_value, xbt_cfg_cb_t cb_set, const char *desc)
 {
-  if (simgrid_config == NULL)
+  if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->registerOption<std::string>(name, desc,
     default_value ? default_value : "", cb_set);
@@ -500,14 +502,14 @@ void xbt_cfg_register_string(const char *name, const char *default_value, xbt_cf
 
 void xbt_cfg_register_boolean(const char *name, const char*default_value,xbt_cfg_cb_t cb_set, const char *desc)
 {
-  if (simgrid_config == NULL)
+  if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->registerOption<bool>(name, desc, simgrid::config::parseBool(default_value), cb_set);
 }
 
 void xbt_cfg_register_alias(const char *realname, const char *aliasname)
 {
-  if (simgrid_config == NULL)
+  if (simgrid_config == nullptr)
     simgrid_config = xbt_cfg_new();
   simgrid_config->alias(realname, aliasname);
 }
@@ -548,7 +550,7 @@ void xbt_cfg_set_parse(const char *options)
     }
     if (option - name == len) {
       XBT_DEBUG("Boundary=EOL");
-      option = NULL;            /* don't do next iteration */
+      option = nullptr;            /* don't do next iteration */
     } else {
       XBT_DEBUG("Boundary on '%c'. len=%d;option-name=%ld", *option, len, (long) (option - name));
       /* Pass the following blank chars */
@@ -558,7 +560,7 @@ void xbt_cfg_set_parse(const char *options)
         option++;
       }
       if (option - name == len - 1)
-        option = NULL;          /* don't do next iteration */
+        option = nullptr;          /* don't do next iteration */
     }
     XBT_DEBUG("parse now:'%s'; parse later:'%s'", name, option);
 
@@ -603,10 +605,8 @@ on_exception:
 // Exit from the catch blog (and do the correct exceptio cleaning)
 // before attempting to THROWF.
 #define TRANSLATE_EXCEPTIONS(...) \
-  catch(simgrid::config::missing_key_error& e) { goto on_exception; } \
-  catch(...) { goto on_missing_key; } \
-  on_missing_key: THROWF(not_found_error, 0, __VA_ARGS__); \
-  on_exception: THROWF(not_found_error, 0, __VA_ARGS__);
+  catch(simgrid::config::missing_key_error& e) { THROWF(not_found_error, 0, __VA_ARGS__); abort(); } \
+  catch(...) { THROWF(not_found_error, 0, __VA_ARGS__); abort(); }
 
 /** @brief Set the value of a variable, using the string representation of that value
  *
@@ -685,8 +685,8 @@ void xbt_cfg_setdefault_boolean(const char *key, const char *value)
 
 /** @brief Set an integer value to \a name within \a cfg
  *
- * @param name the name of the variable
- * @param val the value of the variable
+ * @param key the name of the variable
+ * @param value the value of the variable
  */
 void xbt_cfg_set_int(const char *key, int value)
 {
@@ -700,8 +700,8 @@ void xbt_cfg_set_int(const char *key, int value)
 
 /** @brief Set or add a double value to \a name within \a cfg
  *
- * @param name the name of the variable
- * @param val the double to set
+ * @param key the name of the variable
+ * @param value the double to set
  */
 void xbt_cfg_set_double(const char *key, double value)
 {
@@ -715,9 +715,8 @@ void xbt_cfg_set_double(const char *key, double value)
 
 /** @brief Set or add a string value to \a name within \a cfg
  *
- * @param cfg the config set
- * @param name the name of the variable
- * @param val the value to be added
+ * @param key the name of the variable
+ * @param value the value to be added
  *
  */
 void xbt_cfg_set_string(const char *key, const char *value)
@@ -732,8 +731,8 @@ void xbt_cfg_set_string(const char *key, const char *value)
 
 /** @brief Set or add a boolean value to \a name within \a cfg
  *
- * @param name the name of the variable
- * @param val the value of the variable
+ * @param key the name of the variable
+ * @param value the value of the variable
  */
 void xbt_cfg_set_boolean(const char *key, const char *value)
 {
@@ -758,7 +757,7 @@ int xbt_cfg_is_default_value(const char *key)
 /*----[ Getting ]---------------------------------------------------------*/
 /** @brief Retrieve an integer value of a variable (get a warning if not uniq)
  *
- * @param name the name of the variable
+ * @param key the name of the variable
  *
  * Returns the first value from the config set under the given name.
  */
@@ -772,8 +771,7 @@ int xbt_cfg_get_int(const char *key)
 
 /** @brief Retrieve a double value of a variable (get a warning if not uniq)
  *
- * @param cfg the config set
- * @param name the name of the variable
+ * @param key the name of the variable
  *
  * Returns the first value from the config set under the given name.
  */
@@ -787,12 +785,11 @@ double xbt_cfg_get_double(const char *key)
 
 /** @brief Retrieve a string value of a variable (get a warning if not uniq)
  *
- * @param cfg the config set
- * @param name the name of the variable
+ * @param key the name of the variable
  *
  * Returns the first value from the config set under the given name.
  * If there is more than one value, it will issue a warning.
- * Returns NULL if there is no value.
+ * Returns nullptr if there is no value.
  *
  * \warning the returned value is the actual content of the config set
  */
@@ -806,8 +803,7 @@ char *xbt_cfg_get_string(const char *key)
 
 /** @brief Retrieve a boolean value of a variable (get a warning if not uniq)
  *
- * @param cfg the config set
- * @param name the name of the variable
+ * @param key the name of the variable
  *
  * Returns the first value from the config set under the given name.
  * If there is more than one value, it will issue a warning.
@@ -837,11 +833,11 @@ XBT_PUBLIC_DATA(xbt_cfg_t) simgrid_config;
 
 static void make_set()
 {
-  simgrid_config = NULL;
+  simgrid_config = nullptr;
   xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
-  xbt_cfg_register_int("speed", 0, NULL, "");
-  xbt_cfg_register_string("peername", "", NULL, "");
-  xbt_cfg_register_string("user", "", NULL, "");
+  xbt_cfg_register_int("speed", 0, nullptr, "");
+  xbt_cfg_register_string("peername", "", nullptr, "");
+  xbt_cfg_register_string("user", "", nullptr, "");
 }                               /* end_of_make_set */
 
 XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
@@ -871,14 +867,11 @@ XBT_TEST_UNIT("use", test_config_use, "Data retrieving tests")
 
   xbt_test_add("Access to a non-existant entry");
   {
-    xbt_ex_t e;
-
-    TRY {
+    try {
       xbt_cfg_set_parse("color:blue");
-    } CATCH(e) {
+    } catch(xbt_ex& e) {
       if (e.category != not_found_error)
         xbt_test_exception(e);
-      xbt_ex_free(e);
     }
   }
   xbt_cfg_free(&simgrid_config);