/* 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-2011. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/*
* 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;
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
+ int buffer_size;
};
/**
* code.
* Setting the LogEvent's valist member is done inside _log_logEvent.
*/
-#ifdef _XBT_WIN32
-#include <stdlib.h> /* calloc */
-#define _XBT_LOG_EV_BUFFER_ZERO() \
- _log_ev.buffer = (char*) calloc(XBT_LOG_BUFF_SIZE + 1, sizeof(char))
-#else
-#include <string.h> /* memset */
-#define _XBT_LOG_EV_BUFFER_ZERO() \
- memset(_log_ev.buffer, 0, XBT_LOG_BUFF_SIZE)
-#endif
/* 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, ...) \
_log_ev.fileName = __FILE__; \
_log_ev.functionName = _XBT_FUNCTION; \
_log_ev.lineNum = __LINE__; \
- _XBT_LOG_EV_BUFFER_ZERO(); \
_xbt_log_event_log(&_log_ev, __VA_ARGS__); \
} \
} while (0)
/** @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__)
/** @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__)
*/
#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")
-#ifdef XBT_LOG_OLD_STYLE
+#ifdef XBT_USE_DEPRECATED
/* Kept for backward compatibility. */
#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