X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c5e4b83e02a8e003c4e5067476649dce17df103..82f4610d753cfd75539f4b7cdfad4296c56c6388:/include/xbt/log.h diff --git a/include/xbt/log.h b/include/xbt/log.h index 790295e941..994cb1ef28 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -1,6 +1,6 @@ /* log - a generic logging facility in the spirit of log4j */ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2011. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -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 @@ -113,10 +114,22 @@ typedef enum { */ #if defined(_MSC_VER) # define _XBT_LOG_PARENT_INITIALIZER(parent) NULL -# define XBT_LOG_CONNECT(parent_cat,child) _XBT_LOGV(child).parent = &_XBT_LOGV(parent_cat) +# define XBT_LOG_CONNECT(child, parent_cat) \ + if (1) { \ + 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) -# define XBT_LOG_CONNECT(parent_cat,child) /* xbt_assert(_XBT_LOGV(child).parent == &_XBT_LOGV(parent_cat)) */ +# define XBT_LOG_CONNECT(child, parent_cat) \ + if (1) { \ + 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 /* XBT_LOG_NEW_SUBCATEGORY_helper: @@ -129,6 +142,8 @@ typedef enum { NULL /* firstChild */, \ NULL /* nextSibling */, \ #catName, \ + desc, \ + 0 /*initialized */, \ xbt_log_priority_uninitialized /* threshold */, \ 1 /* isThreshInherited */, \ NULL /* appender */, \ @@ -145,8 +160,8 @@ typedef enum { * Defines a new subcategory of the parent. */ #define XBT_LOG_NEW_SUBCATEGORY(catName, parent, desc) \ - extern s_xbt_log_category_t _XBT_LOGV(parent); \ - XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc) \ + XBT_LOG_EXTERNAL_CATEGORY(parent); \ + XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc) \ /** * \ingroup XBT_log @@ -241,16 +256,14 @@ typedef struct xbt_log_category_s s_xbt_log_category_t, /* * Do NOT access any members of this structure directly. FIXME: move to private? */ -#ifdef _XBT_WIN32 -#define XBT_LOG_BUFF_SIZE 16384 /* Size of the static string in which we build the log string */ -#else -#define XBT_LOG_BUFF_SIZE 2048 /* Size of the static string in which we build the log string */ -#endif + struct xbt_log_category_s { xbt_log_category_t parent; xbt_log_category_t firstChild; xbt_log_category_t nextSibling; const char *name; + const char *description; + int initialized; int threshold; int isThreshInherited; xbt_log_appender_t appender; @@ -265,12 +278,8 @@ struct xbt_log_event_s { const char *functionName; int lineNum; va_list ap; - va_list ap_copy; /* need a copy to launch dynamic layouts when the static ones overflowed */ -#ifdef _XBT_WIN32 char *buffer; -#else - char buffer[XBT_LOG_BUFF_SIZE]; -#endif + int buffer_size; }; /** @@ -369,13 +378,12 @@ extern xbt_log_layout_t xbt_log_default_layout; * * NOTES * First part is a compile-time constant. - * Call to _log_initCat only happens once. + * Call to xbt_log_cat_init only happens once. */ #define _XBT_LOG_ISENABLEDV(catv, priority) \ (priority >= XBT_LOG_STATIC_THRESHOLD \ - && priority >= catv.threshold \ - && (catv.threshold != xbt_log_priority_uninitialized \ - || _xbt_log_cat_init(&catv, priority)) ) + && (catv.initialized || _xbt_log_cat_init(&catv, priority)) \ + && priority >= catv.threshold) /* * Internal Macros @@ -389,15 +397,6 @@ extern xbt_log_layout_t xbt_log_default_layout; * code. * Setting the LogEvent's valist member is done inside _log_logEvent. */ -#ifdef _XBT_WIN32 -#include /* calloc */ -#define _XBT_LOG_EV_BUFFER_ZERO() \ - _log_ev.buffer = (char*) calloc(XBT_LOG_BUFF_SIZE + 1, sizeof(char)) -#else -#include /* memset */ -#define _XBT_LOG_EV_BUFFER_ZERO() \ - memset(_log_ev.buffer, 0, XBT_LOG_BUFF_SIZE) -#endif /* Logging Macros */ @@ -405,9 +404,9 @@ extern xbt_log_layout_t xbt_log_default_layout; # define XBT_CLOG(cat, prio, ...) \ _XBT_IF_ONE_ARG(_XBT_CLOG_ARG1, _XBT_CLOG_ARGN, __VA_ARGS__)(__VA_ARGS__) # define _XBT_CLOG_ARG1(f) \ - fprintf(stderr,"%s:%d:" f, __FILE__, __LINE__) + fprintf(stderr,"%s:%d:\n" f, __FILE__, __LINE__) # define _XBT_CLOG_ARGN(f, ...) \ - fprintf(stderr,"%s:%d:" f, __FILE__, __LINE__, __VA_ARGS__) + fprintf(stderr,"%s:%d:\n" f, __FILE__, __LINE__, __VA_ARGS__) # define XBT_LOG(...) XBT_CLOG(0, __VA_ARGS__) #else # define XBT_CLOG_(catv, prio, ...) \ @@ -419,7 +418,6 @@ extern xbt_log_layout_t xbt_log_default_layout; _log_ev.fileName = __FILE__; \ _log_ev.functionName = _XBT_FUNCTION; \ _log_ev.lineNum = __LINE__; \ - _XBT_LOG_EV_BUFFER_ZERO(); \ _xbt_log_event_log(&_log_ev, __VA_ARGS__); \ } \ } while (0)