Tracepoint API namespacing 'TRACEPOINT_LOGLEVEL'

[lttng-ust.git] / src / lib / lttng-ust / tracelog.c

diff --git a/src/lib/lttng-ust/tracelog.c b/src/lib/lttng-ust/tracelog.c
index 735d04a946baecfb9a8f8b7b1752af7d23a41672..e5bd3890ff5157107772c77ee91e611e752a3792 100644 (file)
--- a/src/lib/lttng-ust/tracelog.c
+++ b/src/lib/lttng-ust/tracelog.c
@@ -9,7 +9,7 @@
 #include "common/macros.h"
 
 #define TRACEPOINT_CREATE_PROBES
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "lttng-ust-tracelog-provider.h"
 
 #define TRACELOG_CB(level) \
@@ -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); \
@@ -72,18 +72,18 @@
                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)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE)
+TRACELOG_CB(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG)