fix tracelog namespacing of loglevels

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

diff --git a/include/lttng/lttng-ust-tracelog.h b/include/lttng/lttng-ust-tracelog.h
index 5b1c940aa873eea61c324284318dacfff4594528..50b8054b15be6e1495af5b5b17bd02dcac48b97f 100644 (file)
--- a/include/lttng/lttng-ust-tracelog.h
+++ b/include/lttng/lttng-ust-tracelog.h
@@ -23,8 +23,8 @@
 #include <lttng/tracepoint.h>
 #include <stdarg.h>
 
-#define TP_TRACELOG_TEMPLATE(_level_identifier, _level_enum) \
-       TRACEPOINT_EVENT(lttng_ust_tracelog, _level_identifier, \
+#define TP_TRACELOG_TEMPLATE(_level_enum) \
+       TRACEPOINT_EVENT(lttng_ust_tracelog, _level_enum, \
                TP_ARGS(const char *, file, int, line, const char *, func, \
                        const char *, msg, unsigned int, len, void *, ip), \
                TP_FIELDS( \
@@ -34,21 +34,20 @@
                        ctf_sequence_text(char, msg, msg, unsigned int, len) \
                ) \
        ) \
-       TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_identifier, \
-               TRACE_##_level_enum)
+       TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_enum, _level_enum)
 
-TP_TRACELOG_TEMPLATE(emerg, EMERG)
-TP_TRACELOG_TEMPLATE(alert, ALERT)
-TP_TRACELOG_TEMPLATE(crit, CRIT)
-TP_TRACELOG_TEMPLATE(err, ERR)
-TP_TRACELOG_TEMPLATE(warning, WARNING)
-TP_TRACELOG_TEMPLATE(notice, NOTICE)
-TP_TRACELOG_TEMPLATE(info, INFO)
-TP_TRACELOG_TEMPLATE(debug_system, DEBUG_SYSTEM)
-TP_TRACELOG_TEMPLATE(debug_program, DEBUG_PROGRAM)
-TP_TRACELOG_TEMPLATE(debug_process, DEBUG_PROCESS)
-TP_TRACELOG_TEMPLATE(debug_module, DEBUG_MODULE)
-TP_TRACELOG_TEMPLATE(debug_unit, DEBUG_UNIT)
-TP_TRACELOG_TEMPLATE(debug_function, DEBUG_FUNCTION)
-TP_TRACELOG_TEMPLATE(debug_line, DEBUG_LINE)
-TP_TRACELOG_TEMPLATE(debug, DEBUG)
+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)