/* 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-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
*
* 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.
/* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic
printf function. Useful to debug the logging facilities themselves */
#undef XBT_LOG_MAYDAY
-/*#define XBT_LOG_MAYDAY*/
+//#define XBT_LOG_MAYDAY
#ifndef _XBT_LOG_H_
#define _XBT_LOG_H_
#include "xbt/misc.h"
-
#include <stdarg.h>
+#include <stddef.h> /* NULL */
SG_BEGIN_DECL()
/**\brief Log priorities
* \ingroup XBT_log
*
* The different existing priorities.
*/
- typedef enum {
- xbt_log_priority_none = 0, /* used internally (don't poke with) */
- xbt_log_priority_trace = 1, /**< enter and return of some functions */
- xbt_log_priority_debug = 2, /**< crufty output */
- xbt_log_priority_verbose = 3, /**< verbose output for the user wanting more */
- xbt_log_priority_info = 4, /**< output about the regular functionning */
- xbt_log_priority_warning = 5, /**< minor issue encountered */
- xbt_log_priority_error = 6, /**< issue encountered */
- xbt_log_priority_critical = 7, /**< major issue encountered */
-
- xbt_log_priority_infinite = 8, /**< value for XBT_LOG_STATIC_THRESHOLD to not log */
-
- xbt_log_priority_uninitialized = -1 /* used internally (don't poke with) */
- } e_xbt_log_priority_t;
+typedef enum {
+ //! @cond
+ xbt_log_priority_none = 0, /** used internally (don't poke with)*/
+ //! @endcond
+ xbt_log_priority_trace = 1, /**< enter and return of some functions */
+ xbt_log_priority_debug = 2, /**< crufty output */
+ xbt_log_priority_verbose = 3, /**< verbose output for the user wanting more */
+ xbt_log_priority_info = 4, /**< output about the regular functionning */
+ xbt_log_priority_warning = 5, /**< minor issue encountered */
+ xbt_log_priority_error = 6, /**< issue encountered */
+ xbt_log_priority_critical = 7, /**< major issue encountered */
+
+ xbt_log_priority_infinite = 8, /**< value for XBT_LOG_STATIC_THRESHOLD to not log */
+
+ //! @cond
+ xbt_log_priority_uninitialized = -1 /* used internally (don't poke with) */
+ //! @endcond
+} e_xbt_log_priority_t;
/*
* define NLOG to disable at compilation time any logging request
- * define NDEBUG to disable at compilation time any logging request of priority below INFO
+ * define NDEBUG to disable at compilation time any logging request of priority below VERBOSE
*/
# ifdef NDEBUG
# define XBT_LOG_STATIC_THRESHOLD xbt_log_priority_verbose
-# else /* !NLOG && !NDEBUG */
+# else /* !NLOG && !NDEBUG */
# ifndef XBT_LOG_STATIC_THRESHOLD
# define XBT_LOG_STATIC_THRESHOLD xbt_log_priority_none
-# endif /* !XBT_LOG_STATIC_THRESHOLD */
-# endif /* NDEBUG */
-#endif /* !defined(NLOG) */
+# endif /* !XBT_LOG_STATIC_THRESHOLD */
+# endif /* NDEBUG */
+#endif /* !defined(NLOG) */
/* Transforms a category name to a global variable name. */
-#define _XBT_LOGV(cat) _XBT_LOG_CONCAT(_simgrid_log_category__, cat)
-#define _XBT_LOG_CONCAT(x,y) x ## y
+#define _XBT_LOGV(cat) _XBT_LOG_CONCAT(_simgrid_log_category__, cat)
+#define _XBT_LOGV_CTOR(cat) _XBT_LOG_CONCAT2(_XBT_LOGV(cat), __constructor__)
+#define _XBT_LOG_CONCAT(x, y) x ## y
+#define _XBT_LOG_CONCAT2(x, y) _XBT_LOG_CONCAT(x, y)
+/* Apparently, constructor priorities are not supported by gcc on Macs */
+#if defined(__GNUC__) && defined(__APPLE__)
+# define _XBT_LOGV_CTOR_ATTRIBUTE
+#else
+# define _XBT_LOGV_CTOR_ATTRIBUTE _XBT_GNUC_CONSTRUCTOR(600)
+#endif
/* The root of the category hierarchy. */
#define XBT_LOG_ROOT_CAT root
-/* In strict ansi C, we are not allowed to initialize a variable with
- * a non-constant value. But the whole tree of categories is
- * connected by setting the address of the parent category as a field
- * of the child one.
- *
- * Unfortunately, Visual C builder does not target any standard
- * compliance, and C99 is not an exception to this unfortunate rule.
- *
- * So, we work this around by adding a XBT_LOG_CONNECT() macro,
- * allowing to connect a child to its parent. It should be used
- * during the initialization of the code, before the child category
- * gets used.
- *
- * When compiling with gcc, this is not necessary (XBT_LOG_CONNECT
- * defines to nothing). When compiling with MSVC, this is needed if
- * you don't want to see your child category become a child of root
- * directly.
- */
-#if defined(__STRICT_ANSI__) || 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)
-#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)) */
-#endif
+/* The whole tree of categories is connected by setting the address of the
+ * parent category as a field of the child one. This is normally done at the
+ * first use of the category.
+ *
+ * It is however necessary to make this connections as early as possible, if we
+ * want the category to be listed by --help-log-categories.
+ *
+ * When possible, the initializations takes place automatically before the start
+ * of main(). It's the case when compiling with gcc.
+ *
+ * For the other cases, you can use the XBT_LOG_CONNECT(cat) macro to force
+ * early initialization. See, for example, in xbt/log.c, the function
+ * xbt_log_connect_categories().
+ */
+
+#define XBT_LOG_CONNECT(cat) \
+ if (1) { \
+ extern void _XBT_LOGV_CTOR(cat)(void); \
+ _XBT_LOGV_CTOR(cat)(); \
+ } else ((void)0)
/* XBT_LOG_NEW_SUBCATEGORY_helper:
* Implementation of XBT_LOG_NEW_SUBCATEGORY, which must declare "extern parent" in addition
* to avoid an extra declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by
* XBT_LOG_NEW_CATEGORY */
-#define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc) \
- XBT_EXPORT_NO_IMPORT(s_xbt_log_category_t) _XBT_LOGV(catName) = { \
- _XBT_LOG_PARENT_INITIALIZER(parent), \
- NULL /* firstChild */, \
- NULL /* nextSibling */, \
- #catName, \
- xbt_log_priority_uninitialized /* threshold */, \
- 1 /* isThreshInherited */, \
- NULL /* appender */, \
- NULL /* layout */, \
- 1 /* additivity */ \
- }
+#define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc) \
+ SG_BEGIN_DECL() \
+ XBT_PUBLIC(void) _XBT_LOGV_CTOR(catName)(void) _XBT_LOGV_CTOR_ATTRIBUTE; \
+ void _XBT_LOGV_CTOR(catName)(void) \
+ { \
+ XBT_LOG_EXTERNAL_CATEGORY(catName); \
+ if (!_XBT_LOGV(catName).initialized) { \
+ _xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized); \
+ } \
+ } \
+ SG_END_DECL() \
+ XBT_EXPORT_NO_IMPORT(s_xbt_log_category_t) _XBT_LOGV(catName) = { \
+ &_XBT_LOGV(parent), \
+ NULL /* firstChild */, \
+ NULL /* nextSibling */, \
+ #catName, \
+ desc, \
+ 0 /*initialized */, \
+ xbt_log_priority_uninitialized /* threshold */, \
+ 1 /* isThreshInherited */, \
+ NULL /* appender */, \
+ NULL /* layout */, \
+ 1 /* additivity */ \
+ }
+
/**
* \ingroup XBT_log
* \param catName name of new category
* 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
* Indicates which category is the default one.
*/
-#if defined(XBT_LOG_MAYDAY) || defined(SUPERNOVAE_MODE) /*|| defined (NLOG) * turning logging off */
+#if defined(XBT_LOG_MAYDAY) /*|| defined (NLOG) * turning logging off */
# define XBT_LOG_DEFAULT_CATEGORY(cname)
#else
# define XBT_LOG_DEFAULT_CATEGORY(cname) \
- static xbt_log_category_t _XBT_LOGV(default) _XBT_GNUC_UNUSED = &_XBT_LOGV(cname)
+ static xbt_log_category_t _XBT_LOGV(default) _XBT_GNUC_UNUSED = &_XBT_LOGV(cname)
#endif
/**
XBT_PUBLIC(void) xbt_log_control_set(const char *cs);
/* Forward declarations */
- typedef struct xbt_log_appender_s s_xbt_log_appender_t,
- *xbt_log_appender_t;
- typedef struct xbt_log_layout_s s_xbt_log_layout_t, *xbt_log_layout_t;
- typedef struct xbt_log_event_s s_xbt_log_event_t, *xbt_log_event_t;
- typedef struct xbt_log_category_s s_xbt_log_category_t,
- *xbt_log_category_t;
+typedef struct xbt_log_appender_s s_xbt_log_appender_t,
+ *xbt_log_appender_t;
+typedef struct xbt_log_layout_s s_xbt_log_layout_t, *xbt_log_layout_t;
+typedef struct xbt_log_event_s s_xbt_log_event_t, *xbt_log_event_t;
+typedef struct xbt_log_category_s s_xbt_log_category_t,
+ *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;
- int threshold;
- int isThreshInherited;
- xbt_log_appender_t appender;
- xbt_log_layout_t layout;
- int additivity;
- };
-
- struct xbt_log_event_s {
- xbt_log_category_t cat;
- e_xbt_log_priority_t priority;
- const char *fileName;
- 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
- };
+
+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;
+ xbt_log_layout_t layout;
+ int additivity;
+};
+
+struct xbt_log_event_s {
+ xbt_log_category_t cat;
+ e_xbt_log_priority_t priority;
+ const char *fileName;
+ const char *functionName;
+ int lineNum;
+ va_list ap;
+ char *buffer;
+ int buffer_size;
+};
/**
* \ingroup XBT_log_implem
XBT_PUBLIC(xbt_log_layout_t) xbt_log_layout_simple_new(char *arg);
XBT_PUBLIC(xbt_log_layout_t) xbt_log_layout_format_new(char *arg);
XBT_PUBLIC(xbt_log_appender_t) xbt_log_appender_file_new(char *arg);
+XBT_PUBLIC(xbt_log_appender_t) xbt_log_appender2_file_new(char *arg,int roll);
/* ********************************** */
XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT);
- extern xbt_log_appender_t xbt_log_default_appender;
- extern xbt_log_layout_t xbt_log_default_layout;
+extern xbt_log_appender_t xbt_log_default_appender;
+extern xbt_log_layout_t xbt_log_default_layout;
/* ********************** */
/* Public functions again */
*
* 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
* code.
* Setting the LogEvent's valist member is done inside _log_logEvent.
*/
-#ifdef _XBT_WIN32
-#define _XBT_LOG_PRE(catv, priority) do { \
- if (_XBT_LOG_ISENABLEDV(catv, priority)) { \
- s_xbt_log_event_t _log_ev = \
- {NULL,priority,__FILE__,_XBT_FUNCTION,__LINE__}; \
- _log_ev.cat = &(catv); \
- _log_ev.buffer = (char*) calloc(XBT_LOG_BUFF_SIZE + 1, sizeof(char)); \
- _xbt_log_event_log(&_log_ev
-#else
-#define _XBT_LOG_PRE(catv, priority) do { \
- if (_XBT_LOG_ISENABLEDV(catv, priority)) { \
- s_xbt_log_event_t _log_ev = \
- {NULL,priority,__FILE__,_XBT_FUNCTION,__LINE__}; \
- _log_ev.cat = &(catv); \
- _xbt_log_event_log(&_log_ev \
-
-#endif
-
-#define _XBT_LOG_POST \
- ); \
- } } while(0)
-
/* Logging Macros */
#ifdef XBT_LOG_MAYDAY
-# define CLOG0(c, p, f) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__)
-# define CLOG1(c, p, f,a1) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1)
-# define CLOG2(c, p, f,a1,a2) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2)
-# define CLOG3(c, p, f,a1,a2,a3) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3)
-# define CLOG4(c, p, f,a1,a2,a3,a4) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4)
-# define CLOG5(c, p, f,a1,a2,a3,a4,a5) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5)
-# define CLOG6(c, p, f,a1,a2,a3,a4,a5,a6) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6)
-# define CLOG7(c, p, f,a1,a2,a3,a4,a5,a6,a7) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7)
-# define CLOG8(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7,a8)
-# define CLOG9(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7,a8,a9)
-# define CLOG10(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
+# 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:\n" f, __FILE__, __LINE__)
+# define _XBT_CLOG_ARGN(f, ...) \
+ fprintf(stderr,"%s:%d:\n" f, __FILE__, __LINE__, __VA_ARGS__)
+# define XBT_LOG(...) XBT_CLOG(0, __VA_ARGS__)
#else
-# define CLOG0(c, p, f) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f _XBT_LOG_POST
-# define CLOG1(c, p, f,a1) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1 _XBT_LOG_POST
-# define CLOG2(c, p, f,a1,a2) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2 _XBT_LOG_POST
-# define CLOG3(c, p, f,a1,a2,a3) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3 _XBT_LOG_POST
-# define CLOG4(c, p, f,a1,a2,a3,a4) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4 _XBT_LOG_POST
-# define CLOG5(c, p, f,a1,a2,a3,a4,a5) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4,a5 _XBT_LOG_POST
-# define CLOG6(c, p, f,a1,a2,a3,a4,a5,a6) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6 _XBT_LOG_POST
-# define CLOG7(c, p, f,a1,a2,a3,a4,a5,a6,a7) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6,a7 _XBT_LOG_POST
-# define CLOG8(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8 _XBT_LOG_POST
-# define CLOG9(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8,a9 _XBT_LOG_POST
-# define CLOG10(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) _XBT_LOG_PRE(_XBT_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10 _XBT_LOG_POST
+# define XBT_CLOG_(catv, prio, ...) \
+ do { \
+ if (_XBT_LOG_ISENABLEDV(catv, prio)) { \
+ s_xbt_log_event_t _log_ev; \
+ _log_ev.cat = &(catv); \
+ _log_ev.priority = (prio); \
+ _log_ev.fileName = __FILE__; \
+ _log_ev.functionName = _XBT_FUNCTION; \
+ _log_ev.lineNum = __LINE__; \
+ _xbt_log_event_log(&_log_ev, __VA_ARGS__); \
+ } \
+ } while (0)
+# define XBT_CLOG(cat, prio, ...) XBT_CLOG_(_XBT_LOGV(cat), prio, __VA_ARGS__)
+# define XBT_LOG(...) XBT_CLOG_((*_XBT_LOGV(default)), __VA_ARGS__)
#endif
-#define CDEBUG0(c, f) CLOG0(c, xbt_log_priority_debug, f)
-#define CDEBUG1(c, f,a1) CLOG1(c, xbt_log_priority_debug, f,a1)
-#define CDEBUG2(c, f,a1,a2) CLOG2(c, xbt_log_priority_debug, f,a1,a2)
-#define CDEBUG3(c, f,a1,a2,a3) CLOG3(c, xbt_log_priority_debug, f,a1,a2,a3)
-#define CDEBUG4(c, f,a1,a2,a3,a4) CLOG4(c, xbt_log_priority_debug, f,a1,a2,a3,a4)
-#define CDEBUG5(c, f,a1,a2,a3,a4,a5) CLOG5(c, xbt_log_priority_debug, f,a1,a2,a3,a4,a5)
-#define CDEBUG6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6)
-#define CDEBUG7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7)
-#define CDEBUG8(c, f,a1,a2,a3,a4,a5,a6,a7,a8) CLOG8(c, xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CDEBUG9(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) CLOG9(c, xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+
/** @ingroup XBT_log
* @hideinitializer
* \param c the category on which to log
- * \param f the format string
- * \param a1 first argument of the format
- * \param a2 second argument of the format
- * \param a3 third argument of the format
- * \param a4 fourth argument of the format
- * \param a5 fifth argument of the format
- * \param a6 sixth argument of the format
- * \param a7 seventh argument of the format
- * \param a8 eighth argument of the format
- * \param a9 ninth argument of the format
- * \param a10 tenth argument of the format
- * @brief Log an event at the DEBUG priority on the specified category with these args (CDEBUGn exists for any n<10).
- */
-#define CDEBUG10(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) CLOG10(c, xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define CVERB0(c, f) CLOG0(c, xbt_log_priority_verbose, f)
-#define CVERB1(c, f,a1) CLOG1(c, xbt_log_priority_verbose, f,a1)
-#define CVERB2(c, f,a1,a2) CLOG2(c, xbt_log_priority_verbose, f,a1,a2)
-#define CVERB3(c, f,a1,a2,a3) CLOG3(c, xbt_log_priority_verbose, f,a1,a2,a3)
-#define CVERB4(c, f,a1,a2,a3,a4) CLOG4(c, xbt_log_priority_verbose, f,a1,a2,a3,a4)
-#define CVERB5(c, f,a1,a2,a3,a4,a5) CLOG5(c, xbt_log_priority_verbose, f,a1,a2,a3,a4,a5)
-#define CVERB6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6)
-#define CVERB7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7)
-#define CVERB8(c, f,a1,a2,a3,a4,a5,a6,a7,a8) CLOG8(c, xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CVERB9(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) CLOG9(c, xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * \param ... the format string and its arguments
+ * @brief Log an event at the DEBUG priority on the specified category with these args.
+ */
+#define XBT_CDEBUG(c, ...) XBT_CLOG(c, xbt_log_priority_debug, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the VERB priority on the specified category with these args (CVERBn exists for any n<10).
- */
-#define CVERB10(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) CLOG10(c, xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define CINFO0(c, f) CLOG0(c, xbt_log_priority_info, f)
-#define CINFO1(c, f,a1) CLOG1(c, xbt_log_priority_info, f,a1)
-#define CINFO2(c, f,a1,a2) CLOG2(c, xbt_log_priority_info, f,a1,a2)
-#define CINFO3(c, f,a1,a2,a3) CLOG3(c, xbt_log_priority_info, f,a1,a2,a3)
-#define CINFO4(c, f,a1,a2,a3,a4) CLOG4(c, xbt_log_priority_info, f,a1,a2,a3,a4)
-#define CINFO5(c, f,a1,a2,a3,a4,a5) CLOG5(c, xbt_log_priority_info, f,a1,a2,a3,a4,a5)
-#define CINFO6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6)
-#define CINFO7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7)
-#define CINFO8(c, f,a1,a2,a3,a4,a5,a6,a7,a8) CLOG8(c, xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CINFO9(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) CLOG9(c, xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * @brief Log an event at the VERB priority on the specified category with these args.
+ */
+#define XBT_CVERB(c, ...) XBT_CLOG(c, xbt_log_priority_verbose, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the INFO priority on the specified category with these args (CINFOn exists for any n<10).
- */
-#define CINFO10(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) CLOG10(c, xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define CWARN0(c, f) CLOG0(c, xbt_log_priority_warning, f)
-#define CWARN1(c, f,a1) CLOG1(c, xbt_log_priority_warning, f,a1)
-#define CWARN2(c, f,a1,a2) CLOG2(c, xbt_log_priority_warning, f,a1,a2)
-#define CWARN3(c, f,a1,a2,a3) CLOG3(c, xbt_log_priority_warning, f,a1,a2,a3)
-#define CWARN4(c, f,a1,a2,a3,a4) CLOG4(c, xbt_log_priority_warning, f,a1,a2,a3,a4)
-#define CWARN5(c, f,a1,a2,a3,a4,a5) CLOG5(c, xbt_log_priority_warning, f,a1,a2,a3,a4,a5)
-#define CWARN6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6)
-#define CWARN7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7)
-#define CWARN8(c, f,a1,a2,a3,a4,a5,a6,a7,a8) CLOG8(c, xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CWARN9(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) CLOG9(c, xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * @brief Log an event at the INFO priority on the specified category with these args.
+ */
+#define XBT_CINFO(c, ...) XBT_CLOG(c, xbt_log_priority_info, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the WARN priority on the specified category with these args (CWARNn exists for any n<10).
- */
-#define CWARN10(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) CLOG10(c, xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,10)
-
-#define CERROR0(c, f) CLOG0(c, xbt_log_priority_error, f)
-#define CERROR1(c, f,a1) CLOG1(c, xbt_log_priority_error, f,a1)
-#define CERROR2(c, f,a1,a2) CLOG2(c, xbt_log_priority_error, f,a1,a2)
-#define CERROR3(c, f,a1,a2,a3) CLOG3(c, xbt_log_priority_error, f,a1,a2,a3)
-#define CERROR4(c, f,a1,a2,a3,a4) CLOG4(c, xbt_log_priority_error, f,a1,a2,a3,a4)
-#define CERROR5(c, f,a1,a2,a3,a4,a5) CLOG5(c, xbt_log_priority_error, f,a1,a2,a3,a4,a5)
-#define CERROR6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6)
-#define CERROR7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7)
-#define CERROR8(c, f,a1,a2,a3,a4,a5,a6,a7,a8) CLOG8(c, xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CERROR9(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) CLOG9(c, xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * @brief Log an event at the WARN priority on the specified category with these args.
+ */
+#define XBT_CWARN(c, ...) XBT_CLOG(c, xbt_log_priority_warning, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the ERROR priority on the specified category with these args (CERRORn exists for any n<10).
- */
-#define CERROR10(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) CLOG10(c, xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define CCRITICAL0(c, f) CLOG0(c, xbt_log_priority_critical, f)
-#define CCRITICAL1(c, f,a1) CLOG1(c, xbt_log_priority_critical, f,a1)
-#define CCRITICAL2(c, f,a1,a2) CLOG2(c, xbt_log_priority_critical, f,a1,a2)
-#define CCRITICAL3(c, f,a1,a2,a3) CLOG3(c, xbt_log_priority_critical, f,a1,a2,a3)
-#define CCRITICAL4(c, f,a1,a2,a3,a4) CLOG4(c, xbt_log_priority_critical, f,a1,a2,a3,a4)
-#define CCRITICAL5(c, f,a1,a2,a3,a4,a5) CLOG5(c, xbt_log_priority_critical, f,a1,a2,a3,a4,a5)
-#define CCRITICAL6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
-#define CCRITICAL7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7)
-#define CCRITICAL8(c, f,a1,a2,a3,a4,a5,a6,a7,a8) CLOG8(c, xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CCRITICAL9(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) CLOG9(c, xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * @brief Log an event at the ERROR priority on the specified category with these args.
+ */
+#define XBT_CERROR(c, ...) XBT_CLOG(c, xbt_log_priority_error, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
* @brief Log an event at the CRITICAL priority on the specified category with these args (CCRITICALn exists for any n<10).
*/
-#define CCRITICAL10(c, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) CLOG10(c, xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
+#define XBT_CCRITICAL(c, ...) XBT_CLOG(c, xbt_log_priority_critical, __VA_ARGS__)
-#ifdef XBT_LOG_MAYDAY
-# define LOG0(p, f) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__)
-# define LOG1(p, f,a1) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1)
-# define LOG2(p, f,a1,a2) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2)
-# define LOG3(p, f,a1,a2,a3) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3)
-# define LOG4(p, f,a1,a2,a3,a4) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4)
-# define LOG5(p, f,a1,a2,a3,a4,a5) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5)
-# define LOG6(p, f,a1,a2,a3,a4,a5,a6) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6)
-# define LOG7(p, f,a1,a2,a3,a4,a5,a6,a7) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7)
-# define LOG8(p, f,a1,a2,a3,a4,a5,a6,a7,a8) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7,a8)
-# define LOG9(p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7,a8,a9)
-# define LOG10(p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) fprintf(stderr,"%s:%d:" f "\n",__FILE__,__LINE__,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-#else
-# define LOG0(p, f) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f _XBT_LOG_POST
-# define LOG1(p, f,a1) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1 _XBT_LOG_POST
-# define LOG2(p, f,a1,a2) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2 _XBT_LOG_POST
-# define LOG3(p, f,a1,a2,a3) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3 _XBT_LOG_POST
-# define LOG4(p, f,a1,a2,a3,a4) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4 _XBT_LOG_POST
-# define LOG5(p, f,a1,a2,a3,a4,a5) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4,a5 _XBT_LOG_POST
-# define LOG6(p, f,a1,a2,a3,a4,a5,a6) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6 _XBT_LOG_POST
-# define LOG7(p, f,a1,a2,a3,a4,a5,a6,a7) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6,a7 _XBT_LOG_POST
-# define LOG8(p, f,a1,a2,a3,a4,a5,a6,a7,a8) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8 _XBT_LOG_POST
-# define LOG9(p, f,a1,a2,a3,a4,a5,a6,a7,a8,a9) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8,a9 _XBT_LOG_POST
-# define LOG10(p,f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) _XBT_LOG_PRE((*_XBT_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10 _XBT_LOG_POST
-#endif
-
-#define DEBUG0(f) LOG0(xbt_log_priority_debug, f)
-#define DEBUG1(f,a1) LOG1(xbt_log_priority_debug, f,a1)
-#define DEBUG2(f,a1,a2) LOG2(xbt_log_priority_debug, f,a1,a2)
-#define DEBUG3(f,a1,a2,a3) LOG3(xbt_log_priority_debug, f,a1,a2,a3)
-#define DEBUG4(f,a1,a2,a3,a4) LOG4(xbt_log_priority_debug, f,a1,a2,a3,a4)
-#define DEBUG5(f,a1,a2,a3,a4,a5) LOG5(xbt_log_priority_debug, f,a1,a2,a3,a4,a5)
-#define DEBUG6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6)
-#define DEBUG7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7)
-#define DEBUG8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define DEBUG9(f,a1,a2,a3,a4,a5,a6,a7,a8,a9) LOG9(xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
-/** @ingroup XBT_log
- * @hideinitializer
- * \param f the format string
- * \param a1 first argument of the format
- * \param a2 second argument of the format
- * \param a3 third argument of the format
- * \param a4 fourth argument of the format
- * \param a5 fifth argument of the format
- * \param a6 sixth argument of the format
- * \param a7 seventh argument of the format
- * \param a8 eighth argument of the format
- * \param a9 ninth argument of the format
- * \param a10 tenth argument of the format
- * @brief Log an event at the DEBUG priority on the default category with these args (DEBUGn exists for any n<10)
- */
-#define DEBUG10(f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) LOG10(xbt_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define VERB0(f) LOG0(xbt_log_priority_verbose, f)
-#define VERB1(f,a1) LOG1(xbt_log_priority_verbose, f,a1)
-#define VERB2(f,a1,a2) LOG2(xbt_log_priority_verbose, f,a1,a2)
-#define VERB3(f,a1,a2,a3) LOG3(xbt_log_priority_verbose, f,a1,a2,a3)
-#define VERB4(f,a1,a2,a3,a4) LOG4(xbt_log_priority_verbose, f,a1,a2,a3,a4)
-#define VERB5(f,a1,a2,a3,a4,a5) LOG5(xbt_log_priority_verbose, f,a1,a2,a3,a4,a5)
-#define VERB6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6)
-#define VERB7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7)
-#define VERB8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define VERB9(f,a1,a2,a3,a4,a5,a6,a7,a8,a9) LOG9(xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the VERB priority on the default category with these args (VERBn exists for any n<10).
- */
-#define VERB10(f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) LOG10(xbt_log_priority_verbose, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define INFO0(f) LOG0(xbt_log_priority_info, f)
-#define INFO1(f,a1) LOG1(xbt_log_priority_info, f,a1)
-#define INFO2(f,a1,a2) LOG2(xbt_log_priority_info, f,a1,a2)
-#define INFO3(f,a1,a2,a3) LOG3(xbt_log_priority_info, f,a1,a2,a3)
-#define INFO4(f,a1,a2,a3,a4) LOG4(xbt_log_priority_info, f,a1,a2,a3,a4)
-#define INFO5(f,a1,a2,a3,a4,a5) LOG5(xbt_log_priority_info, f,a1,a2,a3,a4,a5)
-#define INFO6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6)
-#define INFO7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7)
-#define INFO8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define INFO9(f,a1,a2,a3,a4,a5,a6,a7,a8,a9) LOG9(xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * \param ... the format string and its arguments
+ * @brief Log an event at the DEBUG priority on the default category with these args.
+ */
+#define XBT_DEBUG(...) XBT_LOG(xbt_log_priority_debug, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the INFO priority on the default category with these args (INFOn exists for any n<10).
- */
-#define INFO10(f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) LOG10(xbt_log_priority_info, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define WARN0(f) LOG0(xbt_log_priority_warning, f)
-#define WARN1(f,a1) LOG1(xbt_log_priority_warning, f,a1)
-#define WARN2(f,a1,a2) LOG2(xbt_log_priority_warning, f,a1,a2)
-#define WARN3(f,a1,a2,a3) LOG3(xbt_log_priority_warning, f,a1,a2,a3)
-#define WARN4(f,a1,a2,a3,a4) LOG4(xbt_log_priority_warning, f,a1,a2,a3,a4)
-#define WARN5(f,a1,a2,a3,a4,a5) LOG5(xbt_log_priority_warning, f,a1,a2,a3,a4,a5)
-#define WARN6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6)
-#define WARN7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7)
-#define WARN8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define WARN9(f,a1,a2,a3,a4,a5,a6,a7,a8,a9) LOG9(xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * @brief Log an event at the VERB priority on the default category with these args.
+ */
+#define XBT_VERB(...) XBT_LOG(xbt_log_priority_verbose, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the WARN priority on the default category with these args (WARNn exists for any n<10).
+ * @brief Log an event at the INFO priority on the default category with these args.
*/
-#define WARN10(f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) LOG10(xbt_log_priority_warning, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
+#define XBT_INFO(...) XBT_LOG(xbt_log_priority_info, __VA_ARGS__)
-
-#define ERROR0(f) LOG0(xbt_log_priority_error, f)
-#define ERROR1(f,a1) LOG1(xbt_log_priority_error, f,a1)
-#define ERROR2(f,a1,a2) LOG2(xbt_log_priority_error, f,a1,a2)
-#define ERROR3(f,a1,a2,a3) LOG3(xbt_log_priority_error, f,a1,a2,a3)
-#define ERROR4(f,a1,a2,a3,a4) LOG4(xbt_log_priority_error, f,a1,a2,a3,a4)
-#define ERROR5(f,a1,a2,a3,a4,a5) LOG5(xbt_log_priority_error, f,a1,a2,a3,a4,a5)
-#define ERROR6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6)
-#define ERROR7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7)
-#define ERROR8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define ERROR9(f,a1,a2,a3,a4,a5,a6,a7,a8,a9) LOG9(xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the ERROR priority on the default category with these args (ERRORn exists for any n<10).
- */
-#define ERROR10(f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) LOG10(xbt_log_priority_error, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
-
-#define CRITICAL0(f) LOG0(xbt_log_priority_critical, f)
-#define CRITICAL1(f,a1) LOG1(xbt_log_priority_critical, f,a1)
-#define CRITICAL2(f,a1,a2) LOG2(xbt_log_priority_critical, f,a1,a2)
-#define CRITICAL3(f,a1,a2,a3) LOG3(xbt_log_priority_critical, f,a1,a2,a3)
-#define CRITICAL4(f,a1,a2,a3,a4) LOG4(xbt_log_priority_critical, f,a1,a2,a3,a4)
-#define CRITICAL5(f,a1,a2,a3,a4,a5) LOG5(xbt_log_priority_critical, f,a1,a2,a3,a4,a5)
-#define CRITICAL6(f,a1,a2,a3,a4,a5,a6) LOG6(xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
-#define CRITICAL7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7)
-#define CRITICAL8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7,a8)
-#define CRITICAL9(f,a1,a2,a3,a4,a5,a6,a7,a8,a9) LOG9(xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7,a8,a9)
+ * @brief Log an event at the WARN priority on the default category with these args.
+ */
+#define XBT_WARN(...) XBT_LOG(xbt_log_priority_warning, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log an event at the CRITICAL priority on the default category with these args (CRITICALn exists for any n<10).
+ * @brief Log an event at the ERROR priority on the default category with these args.
*/
-#define CRITICAL10(f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) LOG10(xbt_log_priority_critical, f,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)
+#define XBT_ERROR(...) XBT_LOG(xbt_log_priority_error, __VA_ARGS__)
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log at TRACE priority that we entered in current function.
+ * @brief Log an event at the CRITICAL priority on the default category with these args.
*/
-#define XBT_IN LOG1(xbt_log_priority_trace, ">> begin of %s", _XBT_FUNCTION)
-#define XBT_IN1(fmt,a) LOG2(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a)
-#define XBT_IN2(fmt,a,b) LOG3(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b)
-#define XBT_IN3(fmt,a,b,c) LOG4(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b,c)
-#define XBT_IN4(fmt,a,b,c,d) LOG5(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b,c,d)
+#define XBT_CRITICAL(...) XBT_LOG(xbt_log_priority_critical, __VA_ARGS__)
+
+#define _XBT_IN_OUT(...) \
+ _XBT_IF_ONE_ARG(_XBT_IN_OUT_ARG1, _XBT_IN_OUT_ARGN, __VA_ARGS__)(__VA_ARGS__)
+#define _XBT_IN_OUT_ARG1(fmt) \
+ XBT_LOG(xbt_log_priority_trace, fmt, _XBT_FUNCTION)
+#define _XBT_IN_OUT_ARGN(fmt, ...) \
+ XBT_LOG(xbt_log_priority_trace, fmt, _XBT_FUNCTION, __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log at TRACE priority that we entered in current function, appending a user specified format taking 5 args (XBT_INn exists for all n in [1,6])
+ * @brief Log at TRACE priority that we entered in current function, appending a user specified format.
*/
-#define XBT_IN5(fmt,a,b,c,d,e) LOG6(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, a,b,c,d,e)
+#define XBT_IN(...) _XBT_IN_OUT(">> begin of %s" __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log at TRACE priority that we exited the current function.
+ * @brief Log at TRACE priority that we exited the current function, appending a user specified format.
*/
-#define XBT_OUT LOG1(xbt_log_priority_trace, "<< end of %s", _XBT_FUNCTION)
+#define XBT_OUT(...) _XBT_IN_OUT("<< end of %s" __VA_ARGS__)
+
/** @ingroup XBT_log
* @hideinitializer
- * @brief Log at TRACE priority a message indicating that we reached that point.
- */
-#define XBT_HERE LOG0(xbt_log_priority_trace, "-- was here")
+ * @brief Log at TRACE priority a message indicating that we reached that point, appending a user specified format.
+ */
+#define XBT_HERE(...) XBT_LOG(xbt_log_priority_trace, "-- was here" __VA_ARGS__)
+
+#ifdef XBT_USE_DEPRECATED
+
+/* Kept for backward compatibility. */
+
+#define CLOG0(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG1(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG2(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG3(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG4(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG5(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG6(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG7(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG8(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG9(...) XBT_CLOG(__VA_ARGS__)
+#define CLOG10(...) XBT_CLOG(__VA_ARGS__)
+
+#define CDEBUG0(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG1(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG2(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG3(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG4(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG5(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG6(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG7(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG8(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG9(...) XBT_CDEBUG(__VA_ARGS__)
+#define CDEBUG10(...) XBT_CDEBUG(__VA_ARGS__)
+
+#define CVERB0(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB1(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB2(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB3(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB4(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB5(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB6(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB7(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB8(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB9(...) XBT_CVERB(__VA_ARGS__)
+#define CVERB10(...) XBT_CVERB(__VA_ARGS__)
+
+#define CINFO0(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO1(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO2(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO3(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO4(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO5(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO6(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO7(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO8(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO9(...) XBT_CINFO(__VA_ARGS__)
+#define CINFO10(...) XBT_CINFO(__VA_ARGS__)
+
+#define CWARN0(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN1(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN2(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN3(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN4(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN5(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN6(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN7(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN8(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN9(...) XBT_CWARN(__VA_ARGS__)
+#define CWARN10(...) XBT_CWARN(__VA_ARGS__)
+
+#define CERROR0(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR1(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR2(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR3(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR4(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR5(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR6(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR7(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR8(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR9(...) XBT_CERROR(__VA_ARGS__)
+#define CERROR10(...) XBT_CERROR(__VA_ARGS__)
+
+#define CCRITICAL0(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL1(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL2(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL3(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL4(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL5(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL6(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL7(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL8(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL9(...) XBT_CCRITICAL(__VA_ARGS__)
+#define CCRITICAL10(...) XBT_CCRITICAL(__VA_ARGS__)
+
+#define LOG0(...) XBT_LOG(__VA_ARGS__)
+#define LOG1(...) XBT_LOG(__VA_ARGS__)
+#define LOG2(...) XBT_LOG(__VA_ARGS__)
+#define LOG3(...) XBT_LOG(__VA_ARGS__)
+#define LOG4(...) XBT_LOG(__VA_ARGS__)
+#define LOG5(...) XBT_LOG(__VA_ARGS__)
+#define LOG6(...) XBT_LOG(__VA_ARGS__)
+#define LOG7(...) XBT_LOG(__VA_ARGS__)
+#define LOG8(...) XBT_LOG(__VA_ARGS__)
+#define LOG9(...) XBT_LOG(__VA_ARGS__)
+#define LOG10(...) XBT_LOG(__VA_ARGS__)
+
+#define DEBUG0(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG1(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG2(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG3(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG4(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG5(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG6(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG7(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG8(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG9(...) XBT_DEBUG(__VA_ARGS__)
+#define DEBUG10(...) XBT_DEBUG(__VA_ARGS__)
+
+#define VERB0(...) XBT_VERB(__VA_ARGS__)
+#define VERB1(...) XBT_VERB(__VA_ARGS__)
+#define VERB2(...) XBT_VERB(__VA_ARGS__)
+#define VERB3(...) XBT_VERB(__VA_ARGS__)
+#define VERB4(...) XBT_VERB(__VA_ARGS__)
+#define VERB5(...) XBT_VERB(__VA_ARGS__)
+#define VERB6(...) XBT_VERB(__VA_ARGS__)
+#define VERB7(...) XBT_VERB(__VA_ARGS__)
+#define VERB8(...) XBT_VERB(__VA_ARGS__)
+#define VERB9(...) XBT_VERB(__VA_ARGS__)
+#define VERB10(...) XBT_VERB(__VA_ARGS__)
+
+#define INFO0(...) XBT_INFO(__VA_ARGS__)
+#define INFO1(...) XBT_INFO(__VA_ARGS__)
+#define INFO2(...) XBT_INFO(__VA_ARGS__)
+#define INFO3(...) XBT_INFO(__VA_ARGS__)
+#define INFO4(...) XBT_INFO(__VA_ARGS__)
+#define INFO5(...) XBT_INFO(__VA_ARGS__)
+#define INFO6(...) XBT_INFO(__VA_ARGS__)
+#define INFO7(...) XBT_INFO(__VA_ARGS__)
+#define INFO8(...) XBT_INFO(__VA_ARGS__)
+#define INFO9(...) XBT_INFO(__VA_ARGS__)
+#define INFO10(...) XBT_INFO(__VA_ARGS__)
+
+#define WARN0(...) XBT_WARN(__VA_ARGS__)
+#define WARN1(...) XBT_WARN(__VA_ARGS__)
+#define WARN2(...) XBT_WARN(__VA_ARGS__)
+#define WARN3(...) XBT_WARN(__VA_ARGS__)
+#define WARN4(...) XBT_WARN(__VA_ARGS__)
+#define WARN5(...) XBT_WARN(__VA_ARGS__)
+#define WARN6(...) XBT_WARN(__VA_ARGS__)
+#define WARN7(...) XBT_WARN(__VA_ARGS__)
+#define WARN8(...) XBT_WARN(__VA_ARGS__)
+#define WARN9(...) XBT_WARN(__VA_ARGS__)
+#define WARN10(...) XBT_WARN(__VA_ARGS__)
+
+#define ERROR0(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR1(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR2(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR3(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR4(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR5(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR6(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR7(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR8(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR9(...) XBT_ERROR(__VA_ARGS__)
+#define ERROR10(...) XBT_ERROR(__VA_ARGS__)
+
+#define CRITICAL0(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL1(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL2(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL3(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL4(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL5(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL6(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL7(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL8(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL9(...) XBT_CRITICAL(__VA_ARGS__)
+#define CRITICAL10(...) XBT_CRITICAL(__VA_ARGS__)
+
+#define XBT_IN1(...) XBT_IN(__VA_ARGS__);
+#define XBT_IN2(...) XBT_IN(__VA_ARGS__);
+#define XBT_IN3(...) XBT_IN(__VA_ARGS__);
+#define XBT_IN4(...) XBT_IN(__VA_ARGS__);
+#define XBT_IN5(...) XBT_IN(__VA_ARGS__);
+#define XBT_IN6(...) XBT_IN(__VA_ARGS__);
+#endif
SG_END_DECL()
-#endif /* ! _XBT_LOG_H_ */
+#endif /* ! _XBT_LOG_H_ */
