Tracepoint API namespacing 'TP_ARGS'

[lttng-ust.git] / include / lttng / tracelog.h

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index e80f23813b250cb58244128b15d7a8293674ce17..d5fd93694b4980c5953909dfce16ed9681aad437 100644 (file)
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -14,12 +14,14 @@ extern "C" {
 #endif
 
 #define TP_TRACELOG_CB_TEMPLATE(level)                                 \
-       __attribute__ ((format(printf, 4, 5)))                          \
        extern void _lttng_ust_tracelog_##level(const char *file,       \
-               int line, const char *func, const char *fmt, ...);      \
-       __attribute__ ((format(printf, 4, 0)))                          \
+               int line, const char *func, const char *fmt, ...)       \
+               __attribute__ ((format(printf, 4, 5)));                 \
+                                                                       \
        extern void _lttng_ust_vtracelog_##level(const char *file,      \
-               int line, const char *func, const char *fmt, va_list ap);
+               int line, const char *func, const char *fmt,            \
+               va_list ap)                                             \
+               __attribute__ ((format(printf, 4, 0)));
 
 TP_TRACELOG_CB_TEMPLATE(TRACE_EMERG);
 TP_TRACELOG_CB_TEMPLATE(TRACE_ALERT);
@@ -41,7 +43,7 @@ TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG);
 
 #define tracelog(level, fmt, ...)                                      \
        do {                                                            \
-               LTTNG_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
+               LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
                if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \
                        _lttng_ust_tracelog_##level(__FILE__, __LINE__, __func__, \
                                fmt, ## __VA_ARGS__);                   \