X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracef.h;h=08dca5ba1864c214980f6994c1ea8dbe32e455fc;hb=2268c76ff5381c518789280f334f04cc4e41bb14;hp=fff912d01eaa568b264db5f62893373847dcabc1;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h
index fff912d0..08dca5ba 100644
--- a/include/lttng/tracef.h
+++ b/include/lttng/tracef.h
@@ -7,30 +7,38 @@
 #ifndef _LTTNG_UST_TRACEF_H
 #define _LTTNG_UST_TRACEF_H
 
-#include <lttng/lttng-ust-tracef.h>
+#include <lttng/ust-api-compat.h>
+#include <lttng/tp/lttng-ust-tracef.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 extern
-void _lttng_ust_tracef(const char *fmt, ...);
+void lttng_ust__tracef(const char *fmt, ...)
+	__attribute__((format(printf, 1, 2)));
 
 extern
-void _lttng_ust_vtracef(const char *fmt, va_list ap);
+void lttng_ust__vtracef(const char *fmt, va_list ap)
+	__attribute__((format(printf, 1, 0)));
 
-#define tracef(fmt, ...)						\
+#define lttng_ust_tracef(fmt, ...)						\
 	do {								\
-		LTTNG_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
-		if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \
-			_lttng_ust_tracef(fmt, ## __VA_ARGS__);		\
+		LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
+		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracef___event.state)) \
+			lttng_ust__tracef(fmt, ## __VA_ARGS__);		\
 	} while (0)
 
-#define vtracef(fmt, ap)						\
+#define lttng_ust_vtracef(fmt, ap)						\
 	do {								\
-		if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \
-			_lttng_ust_vtracef(fmt, ap);		\
+		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracef___event.state)) \
+			lttng_ust__vtracef(fmt, ap);		\
 	} while (0)
+
+#if LTTNG_UST_COMPAT_API(0)
+#define tracef		lttng_ust_tracef
+#endif
+
 #ifdef __cplusplus
 }
 #endif