On win64 we must use XBT_LOG_MAYDAY.

[simgrid.git] / include / xbt / log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 2930369..8ffe99f 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -27,8 +27,12 @@
 
 /* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic
    printf function. Useful to debug the logging facilities themselves */
+#include "gras_config.h"
 #undef XBT_LOG_MAYDAY
 //#define XBT_LOG_MAYDAY
+#ifdef _WIN64
+       #define XBT_LOG_MAYDAY
+#endif
 
 #ifndef _XBT_LOG_H_
 #define _XBT_LOG_H_
@@ -402,9 +406,12 @@ extern xbt_log_layout_t xbt_log_default_layout;
 /* Logging Macros */
 
 #ifdef XBT_LOG_MAYDAY
-# define XBT_CLOG_(cat, prio, f, ...) \
-  fprintf(stderr,"%s:%d:" f "%c", __FILE__, __LINE__, __VA_ARGS__)
-# define XBT_CLOG(cat, prio, ...) XBT_CLOG_(cat, prio, __VA_ARGS__, '\n')
+# 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 XBT_CLOG_(catv, prio, ...)                                     \
@@ -427,8 +434,7 @@ extern xbt_log_layout_t xbt_log_default_layout;
 /** @ingroup XBT_log
  *  @hideinitializer
  * \param c the category on which to log
- * \param f the format string
- * \param ... arguments of the format
+ * \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__)
@@ -465,8 +471,7 @@ extern xbt_log_layout_t xbt_log_default_layout;
 
 /** @ingroup XBT_log
  *  @hideinitializer
- * \param f the format string
- * \param ...
+ * \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__)
@@ -501,35 +506,30 @@ extern xbt_log_layout_t xbt_log_default_layout;
  */
 #define XBT_CRITICAL(...) XBT_LOG(xbt_log_priority_critical, __VA_ARGS__)
 
-/** @ingroup XBT_log
- *  @hideinitializer
- *  @brief Log at TRACE priority that we entered in current function.
- */
-#define XBT_IN       XBT_IN_F("")
-
 /** @ingroup XBT_log
  *  @hideinitializer
  *  @brief Log at TRACE priority that we entered in current function, appending a user specified format.
  */
-#define XBT_IN_F(...) XBT_IN_F_(__VA_ARGS__, "")
-#define XBT_IN_F_(fmt, ...) \
-  XBT_LOG(xbt_log_priority_trace, ">> begin of %s" fmt "%s", \
-          _XBT_FUNCTION, __VA_ARGS__)
+#define XBT_IN(...) \
+  _XBT_IF_ONE_ARG(_XBT_IN_ARG1, _XBT_IN_ARGN, __VA_ARGS__)(__VA_ARGS__)
+#define _XBT_IN_ARG1(fmt) \
+  XBT_LOG(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION)
+#define _XBT_IN_ARGN(fmt, ...) \
+  XBT_LOG(xbt_log_priority_trace, ">> begin of %s" fmt, _XBT_FUNCTION, __VA_ARGS__)
 
 /** @ingroup XBT_log
  *  @hideinitializer
  *  @brief Log at TRACE priority that we exited the current function.
  */
-#define XBT_OUT              XBT_LOG(xbt_log_priority_trace, "<< end of %s",       _XBT_FUNCTION)
+#define XBT_OUT() XBT_LOG(xbt_log_priority_trace, "<< end of %s", _XBT_FUNCTION)
 
 /** @ingroup XBT_log
  *  @hideinitializer
  *  @brief Log at TRACE priority a message indicating that we reached that point.
  */
-#define XBT_HERE             XBT_LOG(xbt_log_priority_trace, "-- was here")
+#define XBT_HERE() XBT_LOG(xbt_log_priority_trace, "-- was here")
 
-#define XBT_LOG_OLD_STYLE
-#ifdef XBT_LOG_OLD_STYLE
+#ifdef XBT_USE_DEPRECATED
 
 /* Kept for backward compatibility. */
 
@@ -701,12 +701,12 @@ extern xbt_log_layout_t xbt_log_default_layout;
 #define CRITICAL9(...) XBT_CRITICAL(__VA_ARGS__)
 #define CRITICAL10(...) XBT_CRITICAL(__VA_ARGS__)
 
-#define XBT_IN1(...) XBT_IN_F(__VA_ARGS__);
-#define XBT_IN2(...) XBT_IN_F(__VA_ARGS__);
-#define XBT_IN3(...) XBT_IN_F(__VA_ARGS__);
-#define XBT_IN4(...) XBT_IN_F(__VA_ARGS__);
-#define XBT_IN5(...) XBT_IN_F(__VA_ARGS__);
-#define XBT_IN6(...) XBT_IN_F(__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