Tracepoint API namespacing ctf_integer

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

diff --git a/include/lttng/tp/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h
index abc66a0c68998653b40278fb3cac61ed2334bff0..c8ae05982d4f8285e66ce8c5f26c493386196248 100644 (file)
--- a/include/lttng/tp/lttng-ust-tracelog.h
+++ b/include/lttng/tp/lttng-ust-tracelog.h
@@ -7,36 +7,37 @@
 #include <lttng/tracepoint.h>
 #include <stdarg.h>
 
-TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
-       TP_ARGS(const char *, file, int, line, const char *, func,
+LTTNG_UST_TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
+       LTTNG_UST_TP_ARGS(const char *, file, int, line, const char *, func,
                const char *, msg, unsigned int, len, void *, ip),
-       TP_FIELDS(
-               ctf_integer(int, line, line)
+       LTTNG_UST_TP_FIELDS(
+               lttng_ust_field_integer(int, line, line)
                ctf_string(file, file)
                ctf_string(func, func)
                ctf_sequence_text(char, msg, msg, unsigned int, len)
+               ctf_unused(ip)
        )
 )
 
-#define TP_TRACELOG_TEMPLATE(_level_enum) \
-       TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
-               TP_ARGS(const char *, file, int, line, const char *, func, \
+#define LTTNG_UST_TP_TRACELOG_TEMPLATE(_level_enum) \
+       LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
+               LTTNG_UST_TP_ARGS(const char *, file, int, line, const char *, func, \
                        const char *, msg, unsigned int, len, void *, ip) \
        ) \
-       TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_enum, _level_enum)
+       LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_enum, _level_enum)
 
-TP_TRACELOG_TEMPLATE(TRACE_EMERG)
-TP_TRACELOG_TEMPLATE(TRACE_ALERT)
-TP_TRACELOG_TEMPLATE(TRACE_CRIT)
-TP_TRACELOG_TEMPLATE(TRACE_ERR)
-TP_TRACELOG_TEMPLATE(TRACE_WARNING)
-TP_TRACELOG_TEMPLATE(TRACE_NOTICE)
-TP_TRACELOG_TEMPLATE(TRACE_INFO)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_SYSTEM)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_PROGRAM)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_PROCESS)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_MODULE)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_UNIT)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_FUNCTION)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_LINE)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE)
+LTTNG_UST_TP_TRACELOG_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG)