X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Flttng-ust-tracelog.h;h=5bd351589a020ce3f35165fbb74999b48884b3a6;hb=15b385c8a645128e3ed89f7f840c1441223097a4;hp=5b1c940aa873eea61c324284318dacfff4594528;hpb=0cb03c850dedb8f1e7f11e2e47764aa4d3ba313b;p=lttng-ust.git

diff --git a/include/lttng/lttng-ust-tracelog.h b/include/lttng/lttng-ust-tracelog.h
index 5b1c940a..5bd35158 100644
--- a/include/lttng/lttng-ust-tracelog.h
+++ b/include/lttng/lttng-ust-tracelog.h
@@ -23,32 +23,36 @@
 #include <lttng/tracepoint.h>
 #include <stdarg.h>
 
-#define TP_TRACELOG_TEMPLATE(_level_identifier, _level_enum) \
-	TRACEPOINT_EVENT(lttng_ust_tracelog, _level_identifier, \
+TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
+	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)
+		ctf_string(file, file)
+		ctf_string(func, func)
+		ctf_sequence_text(char, msg, msg, unsigned int, len)
+	)
+)
+
+#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, \
-			const char *, msg, unsigned int, len, void *, ip), \
-		TP_FIELDS( \
-			ctf_integer(int, line, line) \
-			ctf_string(file, file) \
-			ctf_string(func, func) \
-			ctf_sequence_text(char, msg, msg, unsigned int, len) \
-		) \
+			const char *, msg, unsigned int, len, void *, ip) \
 	) \
-	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)