X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8936bbc125e2396d1573bb629dc9c32181b729f..06645bbecf0c92a95de41ca840ca549efc0df9e2:/include/xbt/log.h diff --git a/include/xbt/log.h b/include/xbt/log.h index 3b77db3737..65a2f5d047 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -18,7 +18,7 @@ * * 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. + * the tools/doxygen/xbt_log_extract_hierarchy.pl utility. * * You can thus be certain that it is uptodate, but it may somehow * lack a final manual touch. @@ -35,6 +35,7 @@ #include "xbt/misc.h" #include +#include /* NULL */ SG_BEGIN_DECL() /**\brief Log priorities * \ingroup XBT_log @@ -118,6 +119,7 @@ typedef enum { XBT_LOG_EXTERNAL_CATEGORY(child); \ XBT_LOG_EXTERNAL_CATEGORY(parent_cat); \ _XBT_LOGV(child).parent = &_XBT_LOGV(parent_cat); \ + _xbt_log_cat_init(&_XBT_LOGV(child), xbt_log_priority_uninitialized); \ } else ((void)0) #else # define _XBT_LOG_PARENT_INITIALIZER(parent) &_XBT_LOGV(parent) @@ -126,6 +128,7 @@ typedef enum { XBT_LOG_EXTERNAL_CATEGORY(child); \ XBT_LOG_EXTERNAL_CATEGORY(parent_cat); \ xbt_assert(_XBT_LOGV(child).parent == &_XBT_LOGV(parent_cat)); \ + _xbt_log_cat_init(&_XBT_LOGV(child), xbt_log_priority_uninitialized); \ } else ((void)0) #endif @@ -139,6 +142,7 @@ typedef enum { NULL /* firstChild */, \ NULL /* nextSibling */, \ #catName, \ + desc, \ 0 /*initialized */, \ xbt_log_priority_uninitialized /* threshold */, \ 1 /* isThreshInherited */, \ @@ -258,6 +262,7 @@ struct xbt_log_category_s { xbt_log_category_t firstChild; xbt_log_category_t nextSibling; const char *name; + const char *description; int initialized; int threshold; int isThreshInherited; @@ -354,20 +359,6 @@ extern xbt_log_layout_t xbt_log_default_layout; /* Public functions again */ /* ********************** */ -/** - * \ingroup XBT_log - * - * Prints some help about using the logging infrastructure. - */ -XBT_PUBLIC(void) xbt_log_help(void); - -/** - * \ingroup XBT_log - * - * Prints the log category hierarchy. - */ -XBT_PUBLIC(void) xbt_log_help_categories(void); - /** * \ingroup XBT_log * \param catName name of the category