X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fprintk.h;h=77fe081b36e835ff26ac6a92afc26bce3fbcecef;hb=f127e61ee231d002fb9a7803643a157e06f6d2e2;hp=fd7cccc3769a9627092e536eede966600be7e1d3;hpb=07dfc1d0e4b093ad02682499a702dc11e54e8302;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/printk.h b/instrumentation/events/lttng-module/printk.h
index fd7cccc3..77fe081b 100644
--- a/instrumentation/events/lttng-module/printk.h
+++ b/instrumentation/events/lttng-module/printk.h
@@ -17,15 +17,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(console,
 
 	TP_ARGS(text, len),
 
-	TP_STRUCT__entry(
-		__dynamic_array_text(char, msg, len)
-	),
-
-	TP_fast_assign(
-		tp_memcpy_dyn(msg, text)
-	),
-
-	TP_printk("%s", __get_str(msg))
+	TP_FIELDS(
+		ctf_sequence_text(char, msg, text, size_t, len)
+	)
 )
 
 #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
@@ -41,15 +35,10 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
 
 	TP_CONDITION(start != end),
 
-	TP_STRUCT__entry(
-		__dynamic_array_text(char, msg, end - start)
-	),
-
-	TP_fast_assign(
-		tp_memcpy_dyn(msg, log_buf + start)
-	),
-
-	TP_printk("%s", __get_str(msg))
+	TP_FIELDS(
+		ctf_sequence_text(char, msg, log_buf + start,
+			size_t, end - start)
+	)
 )
 
 #else /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */
@@ -65,23 +54,21 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
 
 	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