Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add new entry in Release_Notes.
[simgrid.git] / include / xbt / log.h
index d95838a..49adae5 100644 (file)
-/* $Id$ */
-
 /* log - a generic logging facility in the spirit of log4j                  */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003, 2004 Martin Quinson.                                 */
+/* Copyright (c) 2004-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  under the terms of the license (GNU LGPL) which comes with this package. */
* under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* 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 the XBT_LOG_MAYDAY symbol to change all logging facilities into basic printfs, e.g. to debug the logs
+ * themselves. */
+//#define XBT_LOG_MAYDAY
 
-#ifndef _GRAS_LOG_H_
-#define _GRAS_LOG_H_
+#ifndef XBT_LOG_H
+#define XBT_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_priority_debug:         crufty output 
- * @gras_log_priority_verbose:       verbose output for the user wanting more
- * @gras_log_priority_info:          output about the regular functionning 
- * @gras_log_priority_warning:       minor issue encountered 
- * @gras_log_priority_error:         issue encountered 
- * @gras_log_priority_critical:      major issue encountered 
- * @gras_log_priority_infinite:      value for GRAS_LOG_STATIC_THRESHOLD to not log
- * @gras_log_priority_uninitialized: used internally (don't poke with)
+#include <stddef.h> /* NULL */
+#include <stdio.h>  /* FILE */
+#include <xbt/base.h>
+SG_BEGIN_DECL
+/**@brief Log priorities
+ * @ingroup XBT_log
  *
  * The different existing priorities.
  */
 typedef enum {
-  gras_log_priority_none          = 0, 
-  gras_log_priority_trace         = 1, 
-  gras_log_priority_debug         = 2, 
-  gras_log_priority_verbose       = 3, 
-  gras_log_priority_info          = 4, 
-  gras_log_priority_warning       = 5, 
-  gras_log_priority_error         = 6, 
-  gras_log_priority_critical      = 7, 
-
-  gras_log_priority_infinite      = 8, 
+  //! @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 functioning */
+  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;
 
-  gras_log_priority_uninitialized = -1 
-} gras_log_priority_t;
-             
-
-/**
- * NLOG:
- *
- * All logging facilities are disabled at compilation time
+/*
+ * define NLOG to disable at compilation time any logging request
+ * define NDEBUG to disable at compilation time any logging request of priority below VERBOSE
  */
 
-
 /**
- * GRAS_LOG_STATIC_THRESHOLD:
+ * @def XBT_LOG_STATIC_THRESHOLD
+ * @ingroup XBT_log
  *
- * All logging with priority < GRAS_LOG_STATIC_THRESHOLD is disabled at
- * compile time, i.e., compiled out.
+ * All logging requests with priority < XBT_LOG_STATIC_THRESHOLD are disabled at compile time, i.e., compiled out.
  */
 #ifdef NLOG
-#  define GRAS_LOG_STATIC_THRESHOLD gras_log_priority_infinite
+#  define XBT_LOG_STATIC_THRESHOLD xbt_log_priority_infinite
 #else
 
 #  ifdef NDEBUG
-#    define GRAS_LOG_STATIC_THRESHOLD gras_log_priority_verbose
-#  else /* !NLOG && !NDEBUG */
+#    define XBT_LOG_STATIC_THRESHOLD xbt_log_priority_verbose
+#  else                         /* !NLOG && !NDEBUG */
 
-#    ifndef GRAS_LOG_STATIC_THRESHOLD
-#      define GRAS_LOG_STATIC_THRESHOLD gras_log_priority_none
-#    endif /* !GRAS_LOG_STATIC_THRESHOLD */
-#  endif /* NDEBUG */
-#endif /* !defined(NLOG) */
+#    ifndef XBT_LOG_STATIC_THRESHOLD
+#      define XBT_LOG_STATIC_THRESHOLD xbt_log_priority_none
+#    endif                      /* !XBT_LOG_STATIC_THRESHOLD */
+#  endif                        /* NDEBUG */
+#endif                          /* !defined(NLOG) */
 
 /* Transforms a category name to a global variable name. */
-#define _GRAS_LOGV(cat)   _GRAS_LOG_CONCAT(_gras_this_log_category_does_not_exist__, cat)
-#define _GRAS_LOG_CONCAT(x,y) x ## y
+#define _XBT_LOGV(cat) _XBT_CONCAT(_simgrid_log_category__, cat)
+#define _XBT_LOGV_CTOR(cat) _XBT_CONCAT2(_XBT_LOGV(cat), __constructor__)
 
 /* The root of the category hierarchy. */
-#define GRAS_LOG_ROOT_CAT   root
+#define XBT_LOG_ROOT_CAT   root
+
+/* 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. We use constructor attributes for these initializations to take place automatically before the
+ * start of main().
+ */
+
+/* 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)                                                          \
+  SG_BEGIN_DECL                                                                                                        \
+  extern void _XBT_LOGV_CTOR(catName)(void) XBT_ATTRIB_CONSTRUCTOR(600);                                               \
+  SG_END_DECL                                                                                                          \
+  void _XBT_LOGV_CTOR(catName)(void)                                                                                   \
+  {                                                                                                                    \
+    XBT_LOG_EXTERNAL_CATEGORY(catName);                                                                                \
+    (void)_xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized);                                      \
+  }                                                                                                                    \
+  s_xbt_log_category_t _XBT_LOGV(catName) = {                                                                          \
+      &_XBT_LOGV(parent),                                                                                              \
+      NULL /* firstChild */,                                                                                           \
+      NULL /* nextSibling */,                                                                                          \
+      _XBT_STRINGIFY(catName),                                                                                         \
+      (desc),                                                                                                          \
+      0 /*initialized */,                                                                                              \
+      xbt_log_priority_uninitialized /* threshold */,                                                                  \
+      1 /* isThreshInherited */,                                                                                       \
+      NULL /* appender */,                                                                                             \
+      NULL /* layout */,                                                                                               \
+      1 /* additivity */                                                                                               \
+  }
 
 /**
- * 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
+ * @ingroup XBT_log
+ * @param catName name of new category
+ * @param parent father of the new category in the tree
+ * @param desc string describing the purpose of this category
+ * @hideinitializer
  *
- * Defines a new subcategory of the parent. 
+ * Defines a new subcategory of the 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                                          \
-    }
+#define XBT_LOG_NEW_SUBCATEGORY(catName, parent, desc)                                                                 \
+  XBT_LOG_EXTERNAL_CATEGORY(parent);                                                                                   \
+  XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, (desc))
 
 /**
- * GRAS_LOG_NEW_CATEGORY:
- * @catName: name of new category
- * @desc: string describing the purpose of this category
+ * @ingroup XBT_log
+ * @param catName name of new category
+ * @param desc string describing the purpose of this category
+ * @hideinitializer
  *
  * Creates a new subcategory of the root category.
  */
-#define GRAS_LOG_NEW_CATEGORY(catName,desc)  GRAS_LOG_NEW_SUBCATEGORY(catName, GRAS_LOG_ROOT_CAT, desc)
+#define XBT_LOG_NEW_CATEGORY(catName, desc) XBT_LOG_NEW_SUBCATEGORY_helper(catName, XBT_LOG_ROOT_CAT, (desc))
 
 /**
- * GRAS_LOG_DEFAULT_CATEGORY:
- * @cname: name of the cat
+ * @ingroup XBT_log
+ * @param cname name of the cat
+ * @hideinitializer
  *
  * Indicates which category is the default one.
  */
 
-#if defined(GRAS_LOG_MAYDAY) /*|| defined (NLOG) * turning logging off */
-# define GRAS_LOG_DEFAULT_CATEGORY(cname)
+#if defined(XBT_LOG_MAYDAY) /*|| defined (NLOG) * turning logging off */
+# define XBT_LOG_DEFAULT_CATEGORY(cname)
 #else
-# define GRAS_LOG_DEFAULT_CATEGORY(cname) \
-        static gras_log_category_t* _GRAS_LOGV(default) = &_GRAS_LOGV(cname)
+#define XBT_LOG_DEFAULT_CATEGORY(cname)                                                                                \
+  XBT_ATTRIB_UNUSED static xbt_log_category_t _XBT_LOGV(default) = &_XBT_LOGV(cname)
 #endif
 
 /**
- * GRAS_LOG_NEW_DEFAULT_CATEGORY:
- * @cname: name of the cat
- * @desc: string describing the purpose of this category
+ * @ingroup XBT_log
+ * @param cname name of the cat
+ * @param desc string describing the purpose of this category
+ * @hideinitializer
  *
- * Creates a new subcategory of the root category and makes it the default
- * (used by macros that don't explicitly specify a 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,desc)        \
-    GRAS_LOG_NEW_CATEGORY(cname,desc);                   \
-    GRAS_LOG_DEFAULT_CATEGORY(cname)
+#define XBT_LOG_NEW_DEFAULT_CATEGORY(cname, desc)                                                                      \
+  XBT_LOG_NEW_CATEGORY(cname, (desc));                                                                                 \
+  XBT_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
+ * @ingroup XBT_log
+ * @param cname name of the cat
+ * @param parent name of the parent
+ * @param desc string describing the purpose of this category
+ * @hideinitializer
  *
  * 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, desc) \
-    GRAS_LOG_NEW_SUBCATEGORY(cname, parent, desc);            \
-    GRAS_LOG_DEFAULT_CATEGORY(cname)
+#define XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cname, parent, desc)                                                           \
+  XBT_LOG_NEW_SUBCATEGORY(cname, parent, (desc));                                                                      \
+  XBT_LOG_DEFAULT_CATEGORY(cname)
 
 /**
- * GRAS_LOG_EXTERNAL_CATEGORY:
- * @cname: name of the cat
+ * @ingroup XBT_log
+ * @param cname name of the cat
+ * @hideinitializer
  *
- * Indicates that a category you'll use in this file (to get subcategories of it, 
- * for example) really lives in another file.
+ * Indicates that a category you'll use in this file (e.g., to get subcategories of it) really lives in another file.
  */
 
-#define GRAS_LOG_EXTERNAL_CATEGORY(cname) \
-   extern gras_log_category_t _GRAS_LOGV(cname)
+#define XBT_LOG_EXTERNAL_CATEGORY(cname) \
+   extern s_xbt_log_category_t _XBT_LOGV(cname)
 
-/* Functions you may call */
+/**
+ * @ingroup XBT_log
+ * @param cname name of the cat
+ * @hideinitializer
+ *
+ * Indicates that the default category of this file was declared in another file.
+ */
 
-extern void gras_log_control_set(const char* cs);
+#define XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(cname) \
+   XBT_LOG_EXTERNAL_CATEGORY(cname);\
+   XBT_LOG_DEFAULT_CATEGORY(cname)
 
-/* 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;
+/* Functions you may call */
 
-/**
- * Do NOT access any members of this structure directly.
- */
-struct gras_log_category_s {
-            gras_log_category_t *parent;
-/*@null@*/  gras_log_category_t *firstChild; 
-/*@null@*/  gras_log_category_t *nextSibling;
-            const char *name;
-            int threshold;
-            int isThreshInherited;
-/*@null@*/  gras_log_appender_t *appender;
-            int willLogToParent;
-  /* TODO: Formats? */
-};
+/** Provide a log setting as if it were passed on the command line.
+ *
+ * Expected syntax:
+ *      ( [category] "." [keyword] ":" value (" ")... )...
+ *
+ * where [category] is one the category names (see @ref XBT_log_cats for a complete list of the ones defined in the
+ * SimGrid library) and keyword is one of the following:
+ *
+ *    - threshold: category's threshold priority. Possible values:
+ *             TRACE,DEBUG,VERBOSE,INFO,WARNING,ERROR,CRITICAL
+ *    - add or additivity: whether the logging actions must be passed to the parent category.
+ *      Possible values: 0, 1, no, yes, on, off.
+ *      Default value: yes.
+ *    - fmt: the format to use. See @ref log_use_conf_fmt for more information.
+ *    - app or appender: the appender to use. See @ref log_use_conf_app for more information.
+ */
+XBT_PUBLIC void xbt_log_control_set(const char* cs);
 
-struct gras_log_appender_s {
-  void (*do_append) (gras_log_appender_t* thisLogAppender,
-                   gras_log_event_t* event, const char *fmt);
-  void *appender_data;
+/* Forward declarations */
+typedef struct xbt_log_appender_s  s_xbt_log_appender_t;
+typedef s_xbt_log_appender_t* xbt_log_appender_t;
+typedef struct xbt_log_layout_s  s_xbt_log_layout_t;
+typedef s_xbt_log_layout_t* xbt_log_layout_t;
+typedef struct xbt_log_event_s  s_xbt_log_event_t;
+typedef s_xbt_log_event_t* xbt_log_event_t;
+typedef struct xbt_log_category_s  s_xbt_log_category_t;
+typedef s_xbt_log_category_t* xbt_log_category_t;
+
+/* Do NOT access any members of this structure directly. FIXME: move to private? */
+
+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 gras_log_event_s {
-  gras_log_category_t* cat;
-  gras_log_priority_t priority;
-  const charfileName;
-  const charfunctionName;
+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;
 };
 
 /**
- * gras_log_threshold_set:
- * @cat: the category (not only its name, but the variable)
- * @thresholdPriority: the priority
+ * @ingroup XBT_log_implem
+ * @param cat the category (not only its name, but the variable)
+ * @param thresholdPriority the priority
  *
- * Programatically alters a category's threshold priority (don't use).
+ * Programmatically alters a category's threshold priority (don't use).
  */
-extern void gras_log_threshold_set(gras_log_category_t* cat,
-                                  gras_log_priority_t thresholdPriority);
+XBT_PUBLIC void xbt_log_threshold_set(xbt_log_category_t cat, e_xbt_log_priority_t thresholdPriority);
 
 /**
- * gras_log_parent_set:
- * @cat: the category (not only its name, but the variable)
- * @parent: the parent cat
+ * @ingroup XBT_log_implem
+ * @param cat the category (not only its name, but the variable)
+ * @param app the appender
  *
- * Programatically alter a category's parent (don't use).
+ * Programmatically sets the category's appender. (the preferred interface is through xbt_log_control_set())
  */
-extern void gras_log_parent_set(gras_log_category_t* cat, 
-                               gras_log_category_t* parent);
+XBT_PUBLIC void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app);
+/**
+ * @ingroup XBT_log_implem
+ * @param cat the category (not only its name, but the variable)
+ * @param lay the layout
+ *
+ * Programmatically sets the category's layout. (the preferred interface is through xbt_log_control_set())
+ */
+XBT_PUBLIC void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay);
 
 /**
- * gras_log_appender_set:
- * @cat: the category (not only its name, but the variable)
- * @app: the appender
+ * @ingroup XBT_log_implem
+ * @param cat the category (not only its name, but the variable)
+ * @param additivity whether logging actions must be passed to parent.
  *
- * Programatically sets the category's appender (don't use).
+ * Programmatically sets whether the logging actions must be passed to the parent category.
+ * (the preferred interface is through xbt_log_control_set())
  */
-extern void gras_log_appender_set(gras_log_category_t* cat,
-                                 gras_log_appender_t* app);
+XBT_PUBLIC void xbt_log_additivity_set(xbt_log_category_t cat, int additivity);
 
-/* Functions that you shouldn't call. */
-extern void _gras_log_event_log(gras_log_event_t*ev,
-                               const char *fmt,
-                               ...) _GRAS_GNUC_PRINTF(2,3);
+/** @brief create a new simple layout
+ *
+ * This layout is not as flexible as the pattern one
+ */
+XBT_PUBLIC xbt_log_layout_t xbt_log_layout_simple_new(const char* arg);
+XBT_PUBLIC xbt_log_layout_t xbt_log_layout_format_new(const char* arg);
+XBT_PUBLIC xbt_log_appender_t xbt_log_appender_stream(FILE* f);
+XBT_PUBLIC xbt_log_appender_t xbt_log_appender_file_new(const char* arg);
+XBT_PUBLIC xbt_log_appender_t xbt_log_appender2_file_new(const char* arg, int roll);
 
-extern int _gras_log_cat_init(gras_log_priority_t priority, 
-                             gras_log_category_t* category);
+/* ********************************** */
+/* Functions that you shouldn't call  */
+/* ********************************** */
 
+/** Retrieve and parse all log settings from the command line (don't call it directly) */
+XBT_PUBLIC void xbt_log_init(int* argc, char** argv);
+XBT_PUBLIC void _xbt_log_event_log(xbt_log_event_t ev, const char* fmt, ...) XBT_ATTRIB_PRINTF(2, 3);
+XBT_PUBLIC int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority);
 
-extern gras_log_category_t _GRAS_LOGV(GRAS_LOG_ROOT_CAT);
-GRAS_LOG_EXTERNAL_CATEGORY(GRAS);
-extern gras_log_appender_t *gras_log_default_appender;
+extern s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT);
+
+/* ********************** */
+/* Public functions again */
+/* ********************** */
 
 /**
- * GRAS_LOG_ISENABLED:
- * @catName: name of the category
- * @priority: minimal priority to be enabled to return true
+ * @ingroup XBT_log
+ * @param catName name of the category
+ * @param priority minimal priority to be enabled to return true (must be #e_xbt_log_priority_t)
+ * @hideinitializer
  *
  * Returns true if the given priority is enabled for the category.
- * If you have expensive expressions that are computed outside of the log
- * command and used only within it, you should make its evaluation conditional
- * using this macro.
+ * If you have expensive expressions that are computed outside of the log command and used only within it, you should
+ * make its evaluation conditional using this macro.
  */
-#define GRAS_LOG_ISENABLED(catName, priority) \
-            _GRAS_LOG_ISENABLEDV(_GRAS_LOGV(catName), priority)
+#define XBT_LOG_ISENABLED(catName, priority) _XBT_LOG_ISENABLEDV(_XBT_LOGV(catName), (priority))
 
 /*
- * Helper function that implements GRAS_LOG_ISENABLED.
+ * Helper function that implements XBT_LOG_ISENABLED.
  *
  * 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 _GRAS_LOG_ISENABLEDV(catv, priority)                  \
-       (priority >= GRAS_LOG_STATIC_THRESHOLD                 \
-        && priority >= catv.threshold                         \
-        && (catv.threshold != gras_log_priority_uninitialized \
-            || _gras_log_cat_init(priority, &catv)) )
+#define _XBT_LOG_ISENABLEDV(catv, priority)                                                                            \
+  ((priority) >= XBT_LOG_STATIC_THRESHOLD && ((catv).initialized || _xbt_log_cat_init(&(catv), (priority))) &&         \
+   (priority) >= (catv).threshold)
 
 /*
  * Internal Macros
  * Some kludge macros to ease maintenance. See how they're used below.
  *
- * IMPLEMENTATION NOTE: To reduce the parameter passing overhead of an enabled
- * message, the many parameters passed to the logging function are packed in a
- * structure. Since these values will be usually be passed to at least 3
- * functions, this is a win.
- * It also allows adding new values (such as a timestamp) without breaking
- * code. 
+ * IMPLEMENTATION NOTE: To reduce the parameter passing overhead of an enabled message, the many parameters passed to
+ * the logging function are packed in a structure. Since these values will be usually be passed to at least 3 functions,
+ * this is a win.
+ * It also allows adding new values (such as a timestamp) without breaking code.
  * Setting the LogEvent's valist member is done inside _log_logEvent.
  */
 
-#define _GRAS_LOG_PRE(catv, priority) do {                              \
-     if (_GRAS_LOG_ISENABLEDV(catv, priority)) {                        \
-         gras_log_event_t _log_ev =                                     \
-             {&(catv),priority,__FILE__,_GRAS_GNUC_FUNCTION,__LINE__};         \
-         _gras_log_event_log(&_log_ev
-
-#define _GRAS_LOG_POST                          \
-                        );                      \
-     } } while(0)
-
-
 /* Logging Macros */
 
-#ifdef GRAS_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)
+#ifdef XBT_LOG_MAYDAY
+# 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)                   _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f _GRAS_LOG_POST                
-# define CLOG1(c, p, f,a1)                _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1 _GRAS_LOG_POST             
-# define CLOG2(c, p, f,a1,a2)             _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2 _GRAS_LOG_POST
-# define CLOG3(c, p, f,a1,a2,a3)          _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2,a3 _GRAS_LOG_POST
-# define CLOG4(c, p, f,a1,a2,a3,a4)       _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2,a3,a4 _GRAS_LOG_POST
-# define CLOG5(c, p, f,a1,a2,a3,a4,a5)    _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2,a3,a4,a5 _GRAS_LOG_POST
-# define CLOG6(c, p, f,a1,a2,a3,a4,a5,a6) _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6 _GRAS_LOG_POST
-# define CLOG7(c, p, f,a1,a2,a3,a4,a5,a6,a7) _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6,a7 _GRAS_LOG_POST
-# define CLOG8(c, p, f,a1,a2,a3,a4,a5,a6,a7,a8) _GRAS_LOG_PRE(_GRAS_LOGV(c),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8 _GRAS_LOG_POST
-#endif
 
-#define CDEBUG0(c, f)                   CLOG0(c, gras_log_priority_debug, f)
-#define CDEBUG1(c, f,a1)                CLOG1(c, gras_log_priority_debug, f,a1)
-#define CDEBUG2(c, f,a1,a2)             CLOG2(c, gras_log_priority_debug, f,a1,a2)
-#define CDEBUG3(c, f,a1,a2,a3)          CLOG3(c, gras_log_priority_debug, f,a1,a2,a3)
-#define CDEBUG4(c, f,a1,a2,a3,a4)       CLOG4(c, gras_log_priority_debug, f,a1,a2,a3,a4)
-#define CDEBUG5(c, f,a1,a2,a3,a4,a5)    CLOG5(c, gras_log_priority_debug, f,a1,a2,a3,a4,a5)
-#define CDEBUG6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, gras_log_priority_debug, f,a1,a2,a3,a4,a5,a6)
-#define CDEBUG7(c, f,a1,a2,a3,a4,a5,a6,a7) CLOG7(c, gras_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, gras_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8)
-
-#define CVERB0(c, f)                   CLOG0(c, gras_log_priority_verbose, f)
-#define CVERB1(c, f,a1)                CLOG1(c, gras_log_priority_verbose, f,a1)
-#define CVERB2(c, f,a1,a2)             CLOG2(c, gras_log_priority_verbose, f,a1,a2)
-#define CVERB3(c, f,a1,a2,a3)          CLOG3(c, gras_log_priority_verbose, f,a1,a2,a3)
-#define CVERB4(c, f,a1,a2,a3,a4)       CLOG4(c, gras_log_priority_verbose, f,a1,a2,a3,a4)
-#define CVERB5(c, f,a1,a2,a3,a4,a5)    CLOG5(c, gras_log_priority_verbose, f,a1,a2,a3,a4,a5)
-#define CVERB6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, gras_log_priority_verbose, f,a1,a2,a3,a4,a5,a6)
-
-#define CINFO0(c, f)                   CLOG0(c, gras_log_priority_info, f)
-#define CINFO1(c, f,a1)                CLOG1(c, gras_log_priority_info, f,a1)
-#define CINFO2(c, f,a1,a2)             CLOG2(c, gras_log_priority_info, f,a1,a2)
-#define CINFO3(c, f,a1,a2,a3)          CLOG3(c, gras_log_priority_info, f,a1,a2,a3)
-#define CINFO4(c, f,a1,a2,a3,a4)       CLOG4(c, gras_log_priority_info, f,a1,a2,a3,a4)
-#define CINFO5(c, f,a1,a2,a3,a4,a5)    CLOG5(c, gras_log_priority_info, f,a1,a2,a3,a4,a5)
-#define CINFO6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, gras_log_priority_info, f,a1,a2,a3,a4,a5,a6)
-
-#define CWARN0(c, f)                   CLOG0(c, gras_log_priority_warning, f)
-#define CWARN1(c, f,a1)                CLOG1(c, gras_log_priority_warning, f,a1)
-#define CWARN2(c, f,a1,a2)             CLOG2(c, gras_log_priority_warning, f,a1,a2)
-#define CWARN3(c, f,a1,a2,a3)          CLOG3(c, gras_log_priority_warning, f,a1,a2,a3)
-#define CWARN4(c, f,a1,a2,a3,a4)       CLOG4(c, gras_log_priority_warning, f,a1,a2,a3,a4)
-#define CWARN5(c, f,a1,a2,a3,a4,a5)    CLOG5(c, gras_log_priority_warning, f,a1,a2,a3,a4,a5)
-#define CWARN6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, gras_log_priority_warning, f,a1,a2,a3,a4,a5,a6)
-
-#define CERROR0(c, f)                   CLOG0(c, gras_log_priority_error, f)
-#define CERROR1(c, f,a1)                CLOG1(c, gras_log_priority_error, f,a1)
-#define CERROR2(c, f,a1,a2)             CLOG2(c, gras_log_priority_error, f,a1,a2)
-#define CERROR3(c, f,a1,a2,a3)          CLOG3(c, gras_log_priority_error, f,a1,a2,a3)
-#define CERROR4(c, f,a1,a2,a3,a4)       CLOG4(c, gras_log_priority_error, f,a1,a2,a3,a4)
-#define CERROR5(c, f,a1,a2,a3,a4,a5)    CLOG5(c, gras_log_priority_error, f,a1,a2,a3,a4,a5)
-#define CERROR6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, gras_log_priority_error, f,a1,a2,a3,a4,a5,a6)
+#define XBT_CLOG(category, prio, ...)                                                                                  \
+  do {                                                                                                                 \
+    if (_XBT_LOG_ISENABLEDV((category), (prio))) {                                                                     \
+      s_xbt_log_event_t _log_ev;                                                                                       \
+      _log_ev.cat          = &(category);                                                                              \
+      _log_ev.priority     = (prio);                                                                                   \
+      _log_ev.fileName     = __FILE__;                                                                                 \
+      _log_ev.functionName = __func__;                                                                                 \
+      _log_ev.lineNum      = __LINE__;                                                                                 \
+      _xbt_log_event_log(&_log_ev, __VA_ARGS__);                                                                       \
+    }                                                                                                                  \
+  } while (0)
+
+#define XBT_LOG(prio, ...) XBT_CLOG(*_simgrid_log_category__default, (prio), __VA_ARGS__)
 
-/**
- * CCRITICAL6:
- * @c: the category to log into
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the warning priority.
- *
- * The macros CCRITICAL0 ... CCRITICAL5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
- */
-
-#define CCRITICAL0(c, f)                   CLOG0(c, gras_log_priority_critical, f)
-#define CCRITICAL1(c, f,a1)                CLOG1(c, gras_log_priority_critical, f,a1)
-#define CCRITICAL2(c, f,a1,a2)             CLOG2(c, gras_log_priority_critical, f,a1,a2)
-#define CCRITICAL3(c, f,a1,a2,a3)          CLOG3(c, gras_log_priority_critical, f,a1,a2,a3)
-#define CCRITICAL4(c, f,a1,a2,a3,a4)       CLOG4(c, gras_log_priority_critical, f,a1,a2,a3,a4)
-#define CCRITICAL5(c, f,a1,a2,a3,a4,a5)    CLOG5(c, gras_log_priority_critical, f,a1,a2,a3,a4,a5)
-#define CCRITICAL6(c, f,a1,a2,a3,a4,a5,a6) CLOG6(c, gras_log_priority_critical, f,a1,a2,a3,a4,a5,a6)
-
-#ifdef GRAS_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)
-#else
-# define LOG0(p, f)                   _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f _GRAS_LOG_POST
-# define LOG1(p, f,a1)                _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1 _GRAS_LOG_POST
-# define LOG2(p, f,a1,a2)             _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2 _GRAS_LOG_POST
-# define LOG3(p, f,a1,a2,a3)          _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2,a3 _GRAS_LOG_POST
-# define LOG4(p, f,a1,a2,a3,a4)       _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2,a3,a4 _GRAS_LOG_POST
-# define LOG5(p, f,a1,a2,a3,a4,a5)    _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2,a3,a4,a5 _GRAS_LOG_POST
-# define LOG6(p, f,a1,a2,a3,a4,a5,a6) _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6 _GRAS_LOG_POST
-# define LOG7(p, f,a1,a2,a3,a4,a5,a6,a7) _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6,a7 _GRAS_LOG_POST
-# define LOG8(p, f,a1,a2,a3,a4,a5,a6,a7,a8) _GRAS_LOG_PRE((*_GRAS_LOGV(default)),p) ,f,a1,a2,a3,a4,a5,a6,a7,a8 _GRAS_LOG_POST
 #endif
 
-/**
- * DEBUG6:
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the debug priority.
- *
- * The macros DEBUG0 ... DEBUG5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
+/** @ingroup XBT_log
+ *  @hideinitializer
+ * @param categ the category on which to log
+ * @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(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_debug, __VA_ARGS__)
 
-#define DEBUG0(f)                   LOG0(gras_log_priority_debug, f)
-#define DEBUG1(f,a1)                LOG1(gras_log_priority_debug, f,a1)
-#define DEBUG2(f,a1,a2)             LOG2(gras_log_priority_debug, f,a1,a2)
-#define DEBUG3(f,a1,a2,a3)          LOG3(gras_log_priority_debug, f,a1,a2,a3)
-#define DEBUG4(f,a1,a2,a3,a4)       LOG4(gras_log_priority_debug, f,a1,a2,a3,a4)
-#define DEBUG5(f,a1,a2,a3,a4,a5)    LOG5(gras_log_priority_debug, f,a1,a2,a3,a4,a5)
-#define DEBUG6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_debug, f,a1,a2,a3,a4,a5,a6)
-#define DEBUG7(f,a1,a2,a3,a4,a5,a6,a7) LOG7(gras_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7)
-#define DEBUG8(f,a1,a2,a3,a4,a5,a6,a7,a8) LOG8(gras_log_priority_debug, f,a1,a2,a3,a4,a5,a6,a7,a8)
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the VERB priority on the specified category with these args.
+ */
+#define XBT_CVERB(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_verbose, __VA_ARGS__)
 
-/**
- * VERB6:
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the verbose priority.
- *
- * The macros VERB0 ... VERB5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the INFO priority on the specified category with these args.
  */
+#define XBT_CINFO(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_info, __VA_ARGS__)
 
-#define VERB0(f)                   LOG0(gras_log_priority_verbose, f)
-#define VERB1(f,a1)                LOG1(gras_log_priority_verbose, f,a1)
-#define VERB2(f,a1,a2)             LOG2(gras_log_priority_verbose, f,a1,a2)
-#define VERB3(f,a1,a2,a3)          LOG3(gras_log_priority_verbose, f,a1,a2,a3)
-#define VERB4(f,a1,a2,a3,a4)       LOG4(gras_log_priority_verbose, f,a1,a2,a3,a4)
-#define VERB5(f,a1,a2,a3,a4,a5)    LOG5(gras_log_priority_verbose, f,a1,a2,a3,a4,a5)
-#define VERB6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_verbose, f,a1,a2,a3,a4,a5,a6)
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the WARN priority on the specified category with these args.
+ */
+#define XBT_CWARN(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_warning, __VA_ARGS__)
 
-/**
- * INFO6:
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the info priority.
- *
- * The macros INFO0 ... INFO5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the ERROR priority on the specified category with these args.
  */
+#define XBT_CERROR(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_error, __VA_ARGS__)
 
-#define INFO0(f)                   LOG0(gras_log_priority_info, f)
-#define INFO1(f,a1)                LOG1(gras_log_priority_info, f,a1)
-#define INFO2(f,a1,a2)             LOG2(gras_log_priority_info, f,a1,a2)
-#define INFO3(f,a1,a2,a3)          LOG3(gras_log_priority_info, f,a1,a2,a3)
-#define INFO4(f,a1,a2,a3,a4)       LOG4(gras_log_priority_info, f,a1,a2,a3,a4)
-#define INFO5(f,a1,a2,a3,a4,a5)    LOG5(gras_log_priority_info, f,a1,a2,a3,a4,a5)
-#define INFO6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_info, f,a1,a2,a3,a4,a5,a6)
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the CRITICAL priority on the specified category with these args.
+ */
+#define XBT_CCRITICAL(categ, ...) XBT_CLOG(_XBT_LOGV(categ), xbt_log_priority_critical, __VA_ARGS__)
 
-/**
- * WARN6:
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the warning priority.
- *
- * The macros WARN0 ... WARN5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @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__)
 
-#define WARN0(f)                   LOG0(gras_log_priority_warning, f)
-#define WARN1(f,a1)                LOG1(gras_log_priority_warning, f,a1)
-#define WARN2(f,a1,a2)             LOG2(gras_log_priority_warning, f,a1,a2)
-#define WARN3(f,a1,a2,a3)          LOG3(gras_log_priority_warning, f,a1,a2,a3)
-#define WARN4(f,a1,a2,a3,a4)       LOG4(gras_log_priority_warning, f,a1,a2,a3,a4)
-#define WARN5(f,a1,a2,a3,a4,a5)    LOG5(gras_log_priority_warning, f,a1,a2,a3,a4,a5)
-#define WARN6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_warning, f,a1,a2,a3,a4,a5,a6)
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @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__)
 
-/**
- * ERROR6:
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the error priority.
- *
- * The macros ERROR0 ... ERROR5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the INFO priority on the default category with these args.
  */
+#define XBT_INFO(...) XBT_LOG(xbt_log_priority_info, __VA_ARGS__)
 
-#define ERROR0(f)                   LOG0(gras_log_priority_error, f)
-#define ERROR1(f,a1)                LOG1(gras_log_priority_error, f,a1)
-#define ERROR2(f,a1,a2)             LOG2(gras_log_priority_error, f,a1,a2)
-#define ERROR3(f,a1,a2,a3)          LOG3(gras_log_priority_error, f,a1,a2,a3)
-#define ERROR4(f,a1,a2,a3,a4)       LOG4(gras_log_priority_error, f,a1,a2,a3,a4)
-#define ERROR5(f,a1,a2,a3,a4,a5)    LOG5(gras_log_priority_error, f,a1,a2,a3,a4,a5)
-#define ERROR6(f,a1,a2,a3,a4,a5,a6) LOG6(gras_log_priority_error, f,a1,a2,a3,a4,a5,a6)
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @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__)
 
-/**
- * CRITICAL6:
- * @f: the format string
- * @a1: first argument of the format
- * @a2: second argument of the format
- * @a3: third argument of the format
- * @a4: fourth argument of the format
- * @a5: fifth argument of the format
- * @a6: sixth argument of the format
- *
- * Log something to the current default category under the critical priority.
- *
- * The macros CRITICAL0 ... CRITICAL5 naturally also exist, but are not listed here 
- * for sake of clarity. They just differ in the number of arguments passed
- * along with the format string.
- */
-#define CRITICAL0(f)                   LOG0(gras_log_priority_critical, f)
-#define CRITICAL1(f,a1)                LOG1(gras_log_priority_critical, f,a1)
-#define CRITICAL2(f,a1,a2)             LOG2(gras_log_priority_critical, f,a1,a2)
-#define CRITICAL3(f,a1,a2,a3)          LOG3(gras_log_priority_critical, f,a1,a2,a3)
-#define CRITICAL4(f,a1,a2,a3,a4)       LOG4(gras_log_priority_critical, f,a1,a2,a3,a4)
-#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)
-
-#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_ */
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the ERROR priority on the default category with these args.
+ */
+#define XBT_ERROR(...) XBT_LOG(xbt_log_priority_error, __VA_ARGS__)
+
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log an event at the CRITICAL priority on the default category with these args.
+ */
+#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), __func__)
+#define _XBT_IN_OUT_ARGN(fmt, ...) XBT_LOG(xbt_log_priority_trace, (fmt), __func__, __VA_ARGS__)
+
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log at TRACE priority that we entered in current function, appending a user specified format.
+ */
+#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, appending a user specified format.
+ */
+#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, appending a user specified format.
+ */
+#define XBT_HERE(...) XBT_LOG(xbt_log_priority_trace, "-- was here" __VA_ARGS__)
+
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log help messages through category xbt.xbt_help.
+ */
+#define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
+
+SG_END_DECL
+#endif /* XBT_LOG_H */