X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracelog.h;h=e97c827574a25329521b046b16541d4eba0be40a;hb=1698631bb3fbab41277b3953e193dd2fd4a74afa;hp=f20099413c4bf718de2086af9f53ce4015294146;hpb=06294ff90351f02d01c65d186e3d993f624fef8d;p=lttng-ust.git

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index f2009941..e97c8275 100644
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -7,55 +7,62 @@
 #ifndef _LTTNG_UST_TRACELOG_H
 #define _LTTNG_UST_TRACELOG_H
 
+#include <lttng/ust-api-compat.h>
 #include <lttng/tp/lttng-ust-tracelog.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TP_TRACELOG_CB_TEMPLATE(level)					\
-	extern void _lttng_ust_tracelog_##level(const char *file,	\
+#define LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(level)					\
+	extern void lttng_ust__tracelog_##level(const char *file,	\
 		int line, const char *func, const char *fmt, ...)	\
 		__attribute__ ((format(printf, 4, 5)));			\
 									\
-	extern void _lttng_ust_vtracelog_##level(const char *file,	\
+	extern void lttng_ust__vtracelog_##level(const char *file,	\
 		int line, const char *func, const char *fmt,		\
 		va_list ap)						\
 		__attribute__ ((format(printf, 4, 0)));
 
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE);
-TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG);
-
-#undef TP_TRACELOG_CB_TEMPLATE
-
-#define tracelog(level, fmt, ...)					\
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG);
+
+#undef LTTNG_UST_TP_TRACELOG_CB_TEMPLATE
+
+#define lttng_ust_tracelog(level, fmt, ...)					\
 	do {								\
 		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__, \
+			lttng_ust__tracelog_##level(__FILE__, __LINE__, __func__, \
 				fmt, ## __VA_ARGS__);			\
 	} while (0)
 
-#define vtracelog(level, fmt, ap)					\
+#define lttng_ust_vtracelog(level, fmt, ap)					\
 	do {								\
 		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \
-			_lttng_ust_vtracelog_##level(__FILE__, __LINE__, __func__, \
+			lttng_ust__vtracelog_##level(__FILE__, __LINE__, __func__, \
 				fmt, ap);				\
 	} while (0)
 
+#if LTTNG_UST_COMPAT_API(0)
+#define TP_TRACELOG_CB_TEMPLATE LTTNG_UST_TP_TRACELOG_CB_TEMPLATE
+#define tracelog	lttng_ust_tracelog
+#define vtracelog	lttng_ust_vtracelog
+#endif
+
 #ifdef __cplusplus
 }
 #endif