X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-python-agent%2Flttng_ust_python.h;h=aa77bd1a404e983cd387e57b1e698ba0a2831590;hb=3202f63a4d5e599bf22d6711828614b58c7efcba;hp=c1eae70be99931f5d72d6cf8669b856b9edd675c;hpb=cadfcbfcd89795086bfeb49af84dadc35154c754;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-python-agent/lttng_ust_python.h b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
index c1eae70b..aa77bd1a 100644
--- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h
+++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
@@ -4,16 +4,16 @@
  * Copyright (C) 2014 - David Goulet <dgoulet@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_python
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_python
 
-#if !defined(_TRACEPOINT_LTTNG_UST_PYTHON_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_PYTHON_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_PYTHON_H
 
 #include <lttng/tracepoint.h>
 #include <stdbool.h>
 
-TRACEPOINT_EVENT(lttng_python, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_python, event,
 	LTTNG_UST_TP_ARGS(
 		const char *, asctime,
 		const char *, msg,
@@ -24,22 +24,22 @@ TRACEPOINT_EVENT(lttng_python, event,
 		int, thread,
 		const char *, threadName
 	),
-	TP_FIELDS(
-		ctf_string(asctime, asctime)
-		ctf_string(msg, msg)
-		ctf_string(logger_name, logger_name)
-		ctf_string(funcName, funcName)
-		ctf_integer(unsigned int, lineno, lineno)
-		ctf_integer(unsigned int, int_loglevel, int_loglevel)
-		ctf_integer(unsigned int, thread, thread)
-		ctf_string(threadName, threadName)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_string(asctime, asctime)
+		lttng_ust_field_string(msg, msg)
+		lttng_ust_field_string(logger_name, logger_name)
+		lttng_ust_field_string(funcName, funcName)
+		lttng_ust_field_integer(unsigned int, lineno, lineno)
+		lttng_ust_field_integer(unsigned int, int_loglevel, int_loglevel)
+		lttng_ust_field_integer(unsigned int, thread, thread)
+		lttng_ust_field_string(threadName, threadName)
 	)
 )
 
 #endif /* _TRACEPOINT_LTTNG_UST_PYTHON_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_python.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_python.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>