Introduce vtracelog

[lttng-ust.git] / liblttng-ust / tracelog.c

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index 0e42b4b163d6bbdc61bf1556f8e30bb0e9376c99..ed8a067d84cec0eaf6c8e08b4710da4a90ef9940 100644 (file)
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -23,45 +23,62 @@
 #define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
+#include <helper.h>
 
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 #include "lttng-ust-tracelog-provider.h"
 
 #define TRACELOG_CB(level) \
-       void _lttng_ust_tracelog_##level(const char *file, \
+       static inline __attribute__((always_inline)) \
+       void __lttng_ust_vtracelog_##level(const char *file, \
                        int line, const char *func, \
-                       const char *fmt, ...) \
+                       const char *fmt, va_list ap) \
        { \
-               va_list ap; \
                char *msg; \
-               int len; \
+               const int len = vasprintf(&msg, fmt, ap); \
                \
-               va_start(ap, fmt); \
-               len = vasprintf(&msg, fmt, ap); \
                /* len does not include the final \0 */ \
                if (len < 0) \
                        goto end; \
                __tracepoint_cb_lttng_ust_tracelog___##level(file, \
                        line, func, msg, len, \
-                       __builtin_return_address(0)); \
+                       LTTNG_UST_CALLER_IP()); \
                free(msg); \
        end: \
+               return; \
+       } \
+       \
+       void _lttng_ust_vtracelog_##level(const char *file, \
+                       int line, const char *func, \
+                       const char *fmt, va_list ap) \
+       { \
+               __lttng_ust_vtracelog_##level(file, line, func, fmt, ap); \
+       } \
+       \
+       void _lttng_ust_tracelog_##level(const char *file, \
+                       int line, const char *func, \
+                       const char *fmt, ...) \
+       { \
+               va_list ap; \
+               \
+               va_start(ap, fmt); \
+               __lttng_ust_vtracelog_##level(file, line, func, fmt, ap); \
                va_end(ap); \
        }
 
-TRACELOG_CB(emerg)
-TRACELOG_CB(alert)
-TRACELOG_CB(crit)
-TRACELOG_CB(err)
-TRACELOG_CB(warning)
-TRACELOG_CB(notice)
-TRACELOG_CB(info)
-TRACELOG_CB(debug_system)
-TRACELOG_CB(debug_program)
-TRACELOG_CB(debug_process)
-TRACELOG_CB(debug_module)
-TRACELOG_CB(debug_unit)
-TRACELOG_CB(debug_function)
-TRACELOG_CB(debug_line)
-TRACELOG_CB(debug)
+TRACELOG_CB(TRACE_EMERG)
+TRACELOG_CB(TRACE_ALERT)
+TRACELOG_CB(TRACE_CRIT)
+TRACELOG_CB(TRACE_ERR)
+TRACELOG_CB(TRACE_WARNING)
+TRACELOG_CB(TRACE_NOTICE)
+TRACELOG_CB(TRACE_INFO)
+TRACELOG_CB(TRACE_DEBUG_SYSTEM)
+TRACELOG_CB(TRACE_DEBUG_PROGRAM)
+TRACELOG_CB(TRACE_DEBUG_PROCESS)
+TRACELOG_CB(TRACE_DEBUG_MODULE)
+TRACELOG_CB(TRACE_DEBUG_UNIT)
+TRACELOG_CB(TRACE_DEBUG_FUNCTION)
+TRACELOG_CB(TRACE_DEBUG_LINE)
+TRACELOG_CB(TRACE_DEBUG)