X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f89671e0bd7450461d70d5ced6079123e73c2a63..ff2817b373471c6c43eb6888f52ac40e32c1d480:/include/xbt/log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 6261dfcdc3..6c6c4ffcc8 100644
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -1,29 +1,12 @@
 /* log - a generic logging facility in the spirit of log4j                  */
 
-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
 
-/** @addtogroup XBT_log
- *  @brief A generic logging facility in the spirit of log4j (grounding feature)
- *
- */
-
-/** @defgroup XBT_log_cats Existing log categories
- *  @ingroup XBT_log
- *  @brief (automatically extracted)
- *
- *  This is the list of all existing log categories in SimGrid.
- *  This list is automatically extracted from the source code by the tools/doxygen/xbt_log_extract_hierarchy.pl utility.
- *
- *  It should thus contain every categories that are defined in the SimGrid library.
- *  If you want to see the one defined in your code in addition, provide `--help-logs` on the command line of your
- * simulator.
- */
-
-/* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic
-   printf function. Useful to debug the logging facilities themselves, or to not make source analysis tools mad */
+/* Define the XBT_LOG_MAYDAY symbol to change all logging facilities into basic printfs, e.g. to debug the logs
+ * themselves. */
 //#define XBT_LOG_MAYDAY
 
 #ifndef XBT_LOG_H
@@ -33,7 +16,7 @@
 #include <stddef.h> /* NULL */
 #include <stdio.h>  /* FILE */
 #include <xbt/misc.h>
-SG_BEGIN_DECL()
+SG_BEGIN_DECL
 /**@brief Log priorities
  * @ingroup XBT_log
  *
@@ -46,7 +29,7 @@ typedef enum {
   xbt_log_priority_trace = 1,          /**< enter and return of some functions */
   xbt_log_priority_debug = 2,          /**< crufty output  */
   xbt_log_priority_verbose = 3,        /**< verbose output for the user wanting more */
-  xbt_log_priority_info = 4,           /**< output about the regular functionning */
+  xbt_log_priority_info = 4,           /**< output about the regular functioning */
   xbt_log_priority_warning = 5,        /**< minor issue encountered */
   xbt_log_priority_error = 6,          /**< issue encountered */
   xbt_log_priority_critical = 7,       /**< major issue encountered */
@@ -102,8 +85,9 @@ typedef enum {
  * Implementation of XBT_LOG_NEW_SUBCATEGORY, which must declare "extern parent" in addition to avoid an extra
  * declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by XBT_LOG_NEW_CATEGORY */
 #define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc)                                                          \
-  SG_BEGIN_DECL()                                                                                                      \
+  SG_BEGIN_DECL                                                                                                        \
   extern void _XBT_LOGV_CTOR(catName)(void) XBT_ATTRIB_CONSTRUCTOR(600);                                               \
+  SG_END_DECL                                                                                                          \
   void _XBT_LOGV_CTOR(catName)(void)                                                                                   \
   {                                                                                                                    \
     XBT_LOG_EXTERNAL_CATEGORY(catName);                                                                                \
@@ -111,7 +95,6 @@ typedef enum {
       _xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized);                                          \
     }                                                                                                                  \
   }                                                                                                                    \
-  SG_END_DECL()                                                                                                        \
   XBT_EXPORT_NO_IMPORT s_xbt_log_category_t _XBT_LOGV(catName) = {                                                     \
       &_XBT_LOGV(parent),                                                                                              \
       NULL /* firstChild */,                                                                                           \
@@ -492,5 +475,5 @@ extern xbt_log_layout_t xbt_log_default_layout;
  */
 #define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
 
-SG_END_DECL()
-#endif                          /* ! _XBT_LOG_H_ */
+SG_END_DECL
+#endif /* XBT_LOG_H */