X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fprintk.h;h=b01ac59b22dcaf8a32b9a65020041f8ec6b2b0cd;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=9ac55c72fdc3b6f7363842a69dd8490a8ef4f534;hpb=68ed2ee005d0883cf09466d8dc2b3509acde249a;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/printk.h b/instrumentation/events/lttng-module/printk.h
index 9ac55c72..b01ac59b 100644
--- a/instrumentation/events/lttng-module/printk.h
+++ b/instrumentation/events/lttng-module/printk.h
@@ -1,83 +1,76 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM printk
 
-#if !defined(_TRACE_PRINTK_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_PRINTK_H
+#if !defined(LTTNG_TRACE_PRINTK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_PRINTK_H
 
-#include <linux/tracepoint.h>
-#include <linux/version.h>
+#include <probes/lttng-tracepoint-event.h>
+#include <lttng-kernel-version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,10,0))
+
+LTTNG_TRACEPOINT_EVENT_MAP(console,
+
+	printk_console,
 
-TRACE_EVENT(console,
 	TP_PROTO(const char *text, size_t len),
 
 	TP_ARGS(text, len),
 
-	TP_STRUCT__entry(
-		__dynamic_array_text(char, msg, len)
-	),
+	TP_FIELDS(
+		ctf_sequence_text(char, msg, text, size_t, len)
+	)
+)
 
-	TP_fast_assign(
-		tp_memcpy_dyn(msg, text)
-	),
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,5,0))
 
-	TP_printk("%s", __get_str(msg))
-)
+LTTNG_TRACEPOINT_EVENT_MAP(console,
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+	printk_console,
 
-TRACE_EVENT_CONDITION(console,
 	TP_PROTO(const char *log_buf, unsigned start, unsigned end,
 		 unsigned log_buf_len),
 
 	TP_ARGS(log_buf, start, end, log_buf_len),
 
-	TP_CONDITION(start != end),
-
-	TP_STRUCT__entry(
-		__dynamic_array_text(char, msg, end - start)
-	),
+	TP_FIELDS(
+		ctf_sequence_text(char, msg, log_buf + start,
+			size_t, end - start)
+	)
+)
 
-	TP_fast_assign(
-		tp_memcpy_dyn(msg, log_buf + start)
-	),
+#else /* (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,5,0)) */
 
-	TP_printk("%s", __get_str(msg))
-)
+LTTNG_TRACEPOINT_EVENT_MAP(console,
 
-#else /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */
+	printk_console,
 
-TRACE_EVENT_CONDITION(console,
 	TP_PROTO(const char *log_buf, unsigned start, unsigned end,
 		 unsigned log_buf_len),
 
 	TP_ARGS(log_buf, start, end, log_buf_len),
 
-	TP_CONDITION(start != end),
-
-	TP_STRUCT__entry(
-		__dynamic_array_text_2(char, msg,
-			(start & (log_buf_len - 1)) > (end & (log_buf_len - 1))
+	TP_FIELDS(
+		/*
+		 * printk buffer is gathered from two segments on older kernels.
+		 */
+		ctf_sequence_text(char, msg1,
+			log_buf + (start & (log_buf_len - 1)),
+			size_t, (start & (log_buf_len - 1)) > (end & (log_buf_len - 1))
 				? log_buf_len - (start & (log_buf_len - 1))
-				: end - start,
-			(start & (log_buf_len - 1)) > (end & (log_buf_len - 1))
+				: end - start)
+		ctf_sequence_text(char, msg2,
+			log_buf,
+			size_t, (start & (log_buf_len - 1)) > (end & (log_buf_len - 1))
 				? end & (log_buf_len - 1)
 				: 0)
-	),
-
-	TP_fast_assign(
-		tp_memcpy_dyn_2(msg,
-			log_buf + (start & (log_buf_len - 1)),
-			log_buf)
-	),
-
-	TP_printk("%s", __get_str(msg))
+	)
 )
 
 #endif
 
-#endif /* _TRACE_PRINTK_H */
+#endif /* LTTNG_TRACE_PRINTK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>