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
It looks more coherent like this.
[simgrid.git]
/
include
/
xbt
/
log.h
diff --git
a/include/xbt/log.h
b/include/xbt/log.h
index
4338b65
..
c0d9448
100644
(file)
--- a/
include/xbt/log.h
+++ b/
include/xbt/log.h
@@
-129,6
+129,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 */, \
@@
-247,6
+248,7
@@
struct xbt_log_category_s {
xbt_log_category_t firstChild;
xbt_log_category_t nextSibling;
const char *name;
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;
@@
-361,13
+363,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
@@
-393,7
+394,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)) { \