A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First attempt to display log categoy hierarchy.
[simgrid.git]
/
include
/
xbt
/
log.h
diff --git
a/include/xbt/log.h
b/include/xbt/log.h
index
19f0ca7
..
3b77db3
100644
(file)
--- a/
include/xbt/log.h
+++ b/
include/xbt/log.h
@@
-1,6
+1,6
@@
/* log - a generic logging facility in the spirit of log4j */
/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-113,10
+113,20
@@
typedef enum {
*/
#if defined(_MSC_VER)
# define _XBT_LOG_PARENT_INITIALIZER(parent) NULL
*/
#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); \
+ } else ((void)0)
#else
# define _XBT_LOG_PARENT_INITIALIZER(parent) &_XBT_LOGV(parent)
#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)); \
+ } else ((void)0)
#endif
/* XBT_LOG_NEW_SUBCATEGORY_helper:
#endif
/* XBT_LOG_NEW_SUBCATEGORY_helper:
@@
-129,6
+139,7
@@
typedef enum {
NULL /* firstChild */, \
NULL /* nextSibling */, \
#catName, \
NULL /* firstChild */, \
NULL /* nextSibling */, \
#catName, \
+ 0 /*initialized */, \
xbt_log_priority_uninitialized /* threshold */, \
1 /* isThreshInherited */, \
NULL /* appender */, \
xbt_log_priority_uninitialized /* threshold */, \
1 /* isThreshInherited */, \
NULL /* appender */, \
@@
-242,13
+253,12
@@
typedef struct xbt_log_category_s s_xbt_log_category_t,
* Do NOT access any members of this structure directly. FIXME: move to private?
*/
* Do NOT access any members of this structure directly. FIXME: move to private?
*/
-#define XBT_LOG_BUFF_SIZE 2048 /* Size of the static string in which we build the log string */
-
struct xbt_log_category_s {
xbt_log_category_t parent;
xbt_log_category_t firstChild;
xbt_log_category_t nextSibling;
const char *name;
struct xbt_log_category_s {
xbt_log_category_t parent;
xbt_log_category_t firstChild;
xbt_log_category_t nextSibling;
const char *name;
+ int initialized;
int threshold;
int isThreshInherited;
xbt_log_appender_t appender;
int threshold;
int isThreshInherited;
xbt_log_appender_t appender;
@@
-263,8
+273,8
@@
struct xbt_log_event_s {
const char *functionName;
int lineNum;
va_list ap;
const char *functionName;
int lineNum;
va_list ap;
- va_list ap_copy; /* need a copy to launch dynamic layouts when the static ones overflowed */
-
char buffer[XBT_LOG_BUFF_SIZE]
;
+ char *buffer;
+
int buffer_size
;
};
/**
};
/**
@@
-344,6
+354,20
@@
extern xbt_log_layout_t xbt_log_default_layout;
/* Public functions again */
/* ********************** */
/* 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
/**
* \ingroup XBT_log
* \param catName name of the category
@@
-363,13
+387,12
@@
extern xbt_log_layout_t xbt_log_default_layout;
*
* NOTES
* First part is a compile-time constant.
*
* NOTES
* First part is a compile-time constant.
- * Call to
_log_initCa
t only happens once.
+ * Call to
xbt_log_cat_ini
t only happens once.
*/
#define _XBT_LOG_ISENABLEDV(catv, priority) \
(priority >= XBT_LOG_STATIC_THRESHOLD \
*/
#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
/*
* Internal Macros
@@
-395,7
+418,6
@@
extern xbt_log_layout_t xbt_log_default_layout;
fprintf(stderr,"%s:%d:\n" f, __FILE__, __LINE__, __VA_ARGS__)
# define XBT_LOG(...) XBT_CLOG(0, __VA_ARGS__)
#else
fprintf(stderr,"%s:%d:\n" f, __FILE__, __LINE__, __VA_ARGS__)
# define XBT_LOG(...) XBT_CLOG(0, __VA_ARGS__)
#else
-# include <string.h> /* memset */
# define XBT_CLOG_(catv, prio, ...) \
do { \
if (_XBT_LOG_ISENABLEDV(catv, prio)) { \
# define XBT_CLOG_(catv, prio, ...) \
do { \
if (_XBT_LOG_ISENABLEDV(catv, prio)) { \
@@
-405,7
+427,6
@@
extern xbt_log_layout_t xbt_log_default_layout;
_log_ev.fileName = __FILE__; \
_log_ev.functionName = _XBT_FUNCTION; \
_log_ev.lineNum = __LINE__; \
_log_ev.fileName = __FILE__; \
_log_ev.functionName = _XBT_FUNCTION; \
_log_ev.lineNum = __LINE__; \
- memset(_log_ev.buffer, 0, XBT_LOG_BUFF_SIZE); \
_xbt_log_event_log(&_log_ev, __VA_ARGS__); \
} \
} while (0)
_xbt_log_event_log(&_log_ev, __VA_ARGS__); \
} \
} while (0)