X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Ftracelog.c;h=4a10a641966b6ca7bcda7d9aae4af0d78d9d33a0;hb=1698631bb3fbab41277b3953e193dd2fd4a74afa;hp=735d04a946baecfb9a8f8b7b1752af7d23a41672;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/tracelog.c b/src/lib/lttng-ust/tracelog.c
index 735d04a9..4a10a641 100644
--- a/src/lib/lttng-ust/tracelog.c
+++ b/src/lib/lttng-ust/tracelog.c
@@ -8,19 +8,19 @@
 #include <stdio.h>
 #include "common/macros.h"
 
-#define TRACEPOINT_CREATE_PROBES
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "lttng-ust-tracelog-provider.h"
 
-#define TRACELOG_CB(level) \
+#define LTTNG_UST_TRACELOG_CB(level) \
 	static inline \
-	void __lttng_ust_vtracelog_##level(const char *file, \
+	void lttng_ust___vtracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, va_list ap) \
 		__attribute__((always_inline, format(printf, 4, 0))); \
 	\
 	static inline \
-	void __lttng_ust_vtracelog_##level(const char *file, \
+	void lttng_ust___vtracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, va_list ap) \
 	{ \
@@ -30,7 +30,7 @@
 		/* len does not include the final \0 */ \
 		if (len < 0) \
 			goto end; \
-		__tracepoint_cb_lttng_ust_tracelog___##level(file, \
+		lttng_ust_tracepoint_cb_lttng_ust_tracelog___##level(file, \
 			line, func, msg, len, \
 			LTTNG_UST_CALLER_IP()); \
 		free(msg); \
@@ -38,52 +38,52 @@
 		return; \
 	} \
 	\
-	void _lttng_ust_vtracelog_##level(const char *file, \
+	void lttng_ust__vtracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, va_list ap) \
 		__attribute__ ((format(printf, 4, 0))); \
 	\
-	void _lttng_ust_vtracelog_##level(const char *file, \
+	void lttng_ust__vtracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, va_list ap); \
-	void _lttng_ust_vtracelog_##level(const char *file, \
+	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); \
+		lttng_ust___vtracelog_##level(file, line, func, fmt, ap); \
 	} \
 	\
-	void _lttng_ust_tracelog_##level(const char *file, \
+	void lttng_ust__tracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, ...) \
 		__attribute__ ((format(printf, 4, 5))); \
 	\
-	void _lttng_ust_tracelog_##level(const char *file, \
+	void lttng_ust__tracelog_##level(const char *file, \
 			int line, const char *func, \
 			const char *fmt, ...); \
-	void _lttng_ust_tracelog_##level(const char *file, \
+	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); \
+		lttng_ust___vtracelog_##level(file, line, func, fmt, ap); \
 		va_end(ap); \
 	}
 
-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)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE)
+LTTNG_UST_TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG)