/* GRAS_LOG_MAYDAY: define this to replace the logging facilities with basic
printf function. Useful to debug the logging facilities themselves */
#undef GRAS_LOG_MAYDAY
-//#define GRAS_LOG_MAYDAY
-
+/*#define GRAS_LOG_MAYDAY*/
#ifndef _GRAS_LOG_H_
#define _GRAS_LOG_H_
#include <stdarg.h>
+#include "xbt/sysdep.h"
+
/**
* gras_log_priority_t:
* @gras_log_priority_none: used internally (don't poke with)
* GRAS_LOG_NEW_SUBCATEGORY:
* @catName: name of new category
* @parent: father of the new category in the tree
+ * @desc: string describing the purpose of this category
*
* Defines a new subcategory of the parent.
*/
-//#ifndef NLOG
-#define GRAS_LOG_NEW_SUBCATEGORY(catName, parent) \
+#define GRAS_LOG_NEW_SUBCATEGORY(catName, parent, desc) \
extern gras_log_category_t _GRAS_LOGV(parent); \
gras_log_category_t _GRAS_LOGV(catName) = { \
&_GRAS_LOGV(parent), 0, 0, \
#catName, gras_log_priority_uninitialized, 1, \
0, 1 \
- };
-//#else /* No logging at all, please */
-//#define GRAS_LOG_NEW_SUBCATEGORY(catName,parent)
-//#endif
+ }
/**
* GRAS_LOG_NEW_CATEGORY:
* @catName: name of new category
+ * @desc: string describing the purpose of this category
*
* Creates a new subcategory of the root category.
*/
-#define GRAS_LOG_NEW_CATEGORY(catName) GRAS_LOG_NEW_SUBCATEGORY(catName, GRAS_LOG_ROOT_CAT)
+#define GRAS_LOG_NEW_CATEGORY(catName,desc) GRAS_LOG_NEW_SUBCATEGORY(catName, GRAS_LOG_ROOT_CAT, desc)
/**
* GRAS_LOG_DEFAULT_CATEGORY:
/**
* GRAS_LOG_NEW_DEFAULT_CATEGORY:
* @cname: name of the cat
+ * @desc: string describing the purpose of this category
*
* Creates a new subcategory of the root category and makes it the default
* (used by macros that don't explicitly specify a category).
*/
-#define GRAS_LOG_NEW_DEFAULT_CATEGORY(cname) \
- GRAS_LOG_NEW_CATEGORY(cname) \
+#define GRAS_LOG_NEW_DEFAULT_CATEGORY(cname,desc) \
+ GRAS_LOG_NEW_CATEGORY(cname,desc); \
GRAS_LOG_DEFAULT_CATEGORY(cname)
/**
* GRAS_LOG_NEW_DEFAULT_SUBCATEGORY:
* @cname: name of the cat
* @parent: name of the parent
+ * @desc: string describing the purpose of this category
*
* Creates a new subcategory of the parent category and makes it the default
* (used by macros that don't explicitly specify a category).
*/
-#define GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(cname, parent) \
- GRAS_LOG_NEW_SUBCATEGORY(cname, parent) \
+#define GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(cname, parent, desc) \
+ GRAS_LOG_NEW_SUBCATEGORY(cname, parent, desc); \
GRAS_LOG_DEFAULT_CATEGORY(cname)
/**
#define GRAS_LOG_EXTERNAL_CATEGORY(cname) \
extern gras_log_category_t _GRAS_LOGV(cname)
-// Functions you may call
+/* Functions you may call */
-extern gras_error_t gras_log_control_set(const char* cs);
+extern void gras_log_control_set(const char* cs);
-// Forward declarations
+/* Forward declarations */
typedef struct gras_log_appender_s gras_log_appender_t;
typedef struct gras_log_event_s gras_log_event_t;
typedef struct gras_log_category_s gras_log_category_t;
int isThreshInherited;
/*@null@*/ gras_log_appender_t *appender;
int willLogToParent;
- // TODO: Formats?
+ /* TODO: Formats? */
};
struct gras_log_appender_s {
extern void gras_log_appender_set(gras_log_category_t* cat,
gras_log_appender_t* app);
-// Functions that you shouldn't call.
+/* Functions that you shouldn't call. */
extern void _gras_log_event_log(gras_log_event_t*ev,
const char *fmt,
- ...)
-#ifdef __GNUC__
- __attribute__ ((format (printf, 2, 3)))
-#endif
-;
+ ...) _GRAS_GNUC_PRINTF(2,3);
extern int _gras_log_cat_init(gras_log_priority_t priority,
gras_log_category_t* category);
#define _GRAS_LOG_PRE(catv, priority) do { \
if (_GRAS_LOG_ISENABLEDV(catv, priority)) { \
gras_log_event_t _log_ev = \
- {&(catv),priority,__FILE__,__FUNCTION__,__LINE__}; \
+ {&(catv),priority,__FILE__,_GRAS_GNUC_FUNCTION,__LINE__}; \
_gras_log_event_log(&_log_ev
#define _GRAS_LOG_POST \
#define CRITICAL5(f,a1,a2,a3,a4,a5) LOG5(gras_log_priority_critical, f,a1,a2,a3,a4,a5)
#define CRITICAL6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
-#ifdef __GNUC__
-#define GRAS_IN LOG1(gras_log_priority_trace, ">> begin of %s", __FUNCTION__)
-#define GRAS_IN1(fmt,a) LOG2(gras_log_priority_trace, ">> begin of %s" fmt, __FUNCTION__, a)
-#define GRAS_IN2(fmt,a,b) LOG3(gras_log_priority_trace, ">> begin of %s" fmt, __FUNCTION__, a,b)
-#define GRAS_IN3(fmt,a,b,c) LOG4(gras_log_priority_trace, ">> begin of %s" fmt, __FUNCTION__, a,b,c)
-#define GRAS_IN4(fmt,a,b,c,d) LOG5(gras_log_priority_trace, ">> begin of %s" fmt, __FUNCTION__, a,b,c,d)
-#define GRAS_OUT LOG1(gras_log_priority_trace, "<< end of %s", __FUNCTION__)
-#else /* if fool enough to compile without gcc */
-#define GRAS_IN LOG0(gras_log_priority_trace, ">> begin of function")
-#define GRAS_IN1(fmt,a) LOG2(gras_log_priority_trace, ">> begin of function " fmt, a)
-#define GRAS_IN2(fmt,a,b) LOG3(gras_log_priority_trace, ">> begin of function " fmt, a,b)
-#define GRAS_IN3(fmt,a,b,c) LOG4(gras_log_priority_trace, ">> begin of function " fmt, a,b,c)
-#define GRAS_IN4(fmt,a,b,c,d) LOG5(gras_log_priority_trace, ">> begin of function " fmt, a,b,c,d)
-
-#define GRAS_OUT(fmt,a) LOG0(gras_log_priority_trace, "<< end of function")
-#endif /* end of foolness for non-gcc */
+#define GRAS_IN LOG1(gras_log_priority_trace, ">> begin of %s", _GRAS_GNUC_FUNCTION)
+#define GRAS_IN1(fmt,a) LOG2(gras_log_priority_trace, ">> begin of %s" fmt, _GRAS_GNUC_FUNCTION, a)
+#define GRAS_IN2(fmt,a,b) LOG3(gras_log_priority_trace, ">> begin of %s" fmt, _GRAS_GNUC_FUNCTION, a,b)
+#define GRAS_IN3(fmt,a,b,c) LOG4(gras_log_priority_trace, ">> begin of %s" fmt, _GRAS_GNUC_FUNCTION, a,b,c)
+#define GRAS_IN4(fmt,a,b,c,d) LOG5(gras_log_priority_trace, ">> begin of %s" fmt, _GRAS_GNUC_FUNCTION, a,b,c,d)
+#define GRAS_OUT LOG1(gras_log_priority_trace, "<< end of %s", _GRAS_GNUC_FUNCTION)
#endif /* ! _GRAS_LOG_H_ */
