Tracepoint API namespacing '_TP_EXPROTO'

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

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index 743b6824a0fb2355a7e32a29bd032aff83d91360..d997f74c24faefdefdabdc9a32261815020c7364 100644 (file)
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -7,7 +7,7 @@
 #ifndef _LTTNG_UST_TRACELOG_H
 #define _LTTNG_UST_TRACELOG_H
 
-#include <lttng/lttng-ust-tracelog.h>
+#include <lttng/tp/lttng-ust-tracelog.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,9 +15,13 @@ extern "C" {
 
 #define TP_TRACELOG_CB_TEMPLATE(level)                                 \
        extern void _lttng_ust_tracelog_##level(const char *file,       \
-               int line, const char *func, const char *fmt, ...);      \
+               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);
@@ -39,15 +43,15 @@ TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG);
 
 #define tracelog(level, fmt, ...)                                      \
        do {                                                            \
-               LTTNG_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
-               if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \
+               LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
+               if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \
                        _lttng_ust_tracelog_##level(__FILE__, __LINE__, __func__, \
                                fmt, ## __VA_ARGS__);                   \
        } while (0)
 
 #define vtracelog(level, fmt, ap)                                      \
        do {                                                            \
-               if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \
+               if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \
                        _lttng_ust_vtracelog_##level(__FILE__, __LINE__, __func__, \
                                fmt, ap);                               \
        } while (0)