X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84b1a6eb5aff6720116770c1c606eccf944ca973..1e18ccad74ce3d49299f1da9022c5d5e4ee76918:/include/xbt/log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index c730041b77..bf2025e083 100644
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -7,6 +7,25 @@
 /* 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 was automatically extracted from the source code by
+ *  the src/xbt_log_extract_hierarchy utility.
+ *     
+ *  You can thus be certain that it is uptodate, but it may somehow
+ *  lack a final manual touch.
+ *  Anyway, nothing's perfect ;)
+ */
+
 /* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic
    printf function. Useful to debug the logging facilities themselves */
 #undef XBT_LOG_MAYDAY
@@ -89,6 +108,7 @@ typedef enum {
  * \param catName name of new category
  * \param parent father of the new category in the tree
  * \param desc string describing the purpose of this category
+ * \hideinitializer
  *
  * Defines a new subcategory of the parent. 
  */
@@ -100,6 +120,7 @@ typedef enum {
  * \ingroup XBT_log  
  * \param catName name of new category
  * \param desc string describing the purpose of this category
+ * \hideinitializer
  *
  * Creates a new subcategory of the root category.
  */
@@ -108,6 +129,7 @@ typedef enum {
 /**
  * \ingroup XBT_log  
  * \param cname name of the cat
+ * \hideinitializer
  *
  * Indicates which category is the default one.
  */
@@ -123,6 +145,7 @@ typedef enum {
  * \ingroup XBT_log  
  * \param cname name of the cat
  * \param desc string describing the purpose of this category
+ * \hideinitializer
  *
  * Creates a new subcategory of the root category and makes it the default
  * (used by macros that don't explicitly specify a category).
@@ -136,6 +159,7 @@ typedef enum {
  * \param cname name of the cat
  * \param parent name of the parent
  * \param desc string describing the purpose of this category
+ * \hideinitializer
  *
  * Creates a new subcategory of the parent category and makes it the default
  * (used by macros that don't explicitly specify a category).
@@ -147,6 +171,7 @@ typedef enum {
 /**
  * \ingroup XBT_log  
  * \param cname name of the cat
+ * \hideinitializer
  *
  * Indicates that a category you'll use in this file (to get subcategories of it, 
  * for example) really lives in another file.
@@ -241,6 +266,7 @@ extern xbt_log_appender_t xbt_log_default_appender;
  * \ingroup XBT_log 
  * \param catName name of the category
  * \param priority minimal priority to be enabled to return true
+ * \hideinitializer
  *
  * Returns true if the given priority is enabled for the category.
  * If you have expensive expressions that are computed outside of the log
@@ -279,7 +305,7 @@ extern xbt_log_appender_t xbt_log_default_appender;
 #define _XBT_LOG_PRE(catv, priority) do {                              \
      if (_XBT_LOG_ISENABLEDV(catv, priority)) {                        \
          s_xbt_log_event_t _log_ev =                                   \
-             {&(catv),priority,__FILE__,_XBT_GNUC_FUNCTION,__LINE__};         \
+             {&(catv),priority,__FILE__,_XBT_FUNCTION,__LINE__};         \
          _xbt_log_event_log(&_log_ev
 
 #define _XBT_LOG_POST                          \
@@ -535,12 +561,12 @@ extern xbt_log_appender_t xbt_log_default_appender;
 #define CRITICAL6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
 /* @} */
 
-#define XBT_IN               LOG1(xbt_log_priority_trace, ">> begin of %s",     _XBT_GNUC_FUNCTION)
-#define XBT_IN1(fmt,a)       LOG2(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_GNUC_FUNCTION, a)
-#define XBT_IN2(fmt,a,b)     LOG3(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_GNUC_FUNCTION, a,b)
-#define XBT_IN3(fmt,a,b,c)   LOG4(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_GNUC_FUNCTION, a,b,c)
-#define XBT_IN4(fmt,a,b,c,d) LOG5(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_GNUC_FUNCTION, a,b,c,d)
-#define XBT_OUT              LOG1(xbt_log_priority_trace, "<< end of %s",       _XBT_GNUC_FUNCTION)
+#define XBT_IN               LOG1(xbt_log_priority_trace, ">> begin of %s",     _XBT_FUNCTION)
+#define XBT_IN1(fmt,a)       LOG2(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a)
+#define XBT_IN2(fmt,a,b)     LOG3(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b)
+#define XBT_IN3(fmt,a,b,c)   LOG4(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b,c)
+#define XBT_IN4(fmt,a,b,c,d) LOG5(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b,c,d)
+#define XBT_OUT              LOG1(xbt_log_priority_trace, "<< end of %s",       _XBT_FUNCTION)
 #define XBT_HERE             LOG0(xbt_log_priority_trace, "-- was here")
 
 #endif /* ! _XBT_LOG_H_ */