X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Frandom.h;h=80b227968e611e058840d8c191971fd9918ff0ea;hb=a6a26911cc7888458bd91feb433df584d7dcd5c8;hp=d7bda0df4b7d05281fa7035025c43ce2f71fa7fb;hpb=9cf29d3eaffa56199259919c90108de84724b4fb;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h
index d7bda0df..80b22796 100644
--- a/instrumentation/events/lttng-module/random.h
+++ b/instrumentation/events/lttng-module/random.h
@@ -1,34 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM random
 
-#if !defined(_TRACE_RANDOM_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_RANDOM_H
+#if !defined(LTTNG_TRACE_RANDOM_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_RANDOM_H
 
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/writeback.h>
-#include <linux/tracepoint.h>
 
-DECLARE_EVENT_CLASS(random__mix_pool_bytes,
+LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes,
 	TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
 
 	TP_ARGS(pool_name, bytes, IP),
 
-	TP_STRUCT__entry(
-		__string(   pool_name,	pool_name		)
-		__field(	  int,	bytes			)
-		__field(unsigned long,	IP			)
-	),
-
-	TP_fast_assign(
-		tp_strcpy(pool_name, pool_name)
-		tp_assign(bytes, bytes)
-		tp_assign(IP, IP)
-	),
-
-	TP_printk("%s pool: bytes %d caller %pF",
-		  __get_str(pool_name), __entry->bytes, (void *)__entry->IP)
+	TP_FIELDS(
+		ctf_string(pool_name, pool_name)
+		ctf_integer(int, bytes, bytes)
+		ctf_integer(unsigned long, IP, IP)
+	)
 )
 
-DEFINE_EVENT_MAP(random__mix_pool_bytes, mix_pool_bytes,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes,
 
 	random_mix_pool_bytes,
 
@@ -37,7 +29,7 @@ DEFINE_EVENT_MAP(random__mix_pool_bytes, mix_pool_bytes,
 	TP_ARGS(pool_name, bytes, IP)
 )
 
-DEFINE_EVENT_MAP(random__mix_pool_bytes, mix_pool_bytes_nolock,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes_nolock,
 
 	random_mix_pool_bytes_nolock,
 
@@ -46,7 +38,25 @@ DEFINE_EVENT_MAP(random__mix_pool_bytes, mix_pool_bytes_nolock,
 	TP_ARGS(pool_name, bytes, IP)
 )
 
-TRACE_EVENT_MAP(credit_entropy_bits,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0))
+LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
+
+	random_credit_entropy_bits,
+
+	TP_PROTO(const char *pool_name, int bits, int entropy_count,
+		 unsigned long IP),
+
+	TP_ARGS(pool_name, bits, entropy_count, IP),
+
+	TP_FIELDS(
+		ctf_string(pool_name, pool_name)
+		ctf_integer(int, bits, bits)
+		ctf_integer(int, entropy_count, entropy_count)
+		ctf_integer(unsigned long, IP, IP)
+	)
+)
+#else
+LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
 
 	random_credit_entropy_bits,
 
@@ -55,29 +65,17 @@ TRACE_EVENT_MAP(credit_entropy_bits,
 
 	TP_ARGS(pool_name, bits, entropy_count, entropy_total, IP),
 
-	TP_STRUCT__entry(
-		__string(   pool_name,	pool_name		)
-		__field(	  int,	bits			)
-		__field(	  int,	entropy_count		)
-		__field(	  int,	entropy_total		)
-		__field(unsigned long,	IP			)
-	),
-
-	TP_fast_assign(
-		tp_strcpy(pool_name, pool_name)
-		tp_assign(bits, bits)
-		tp_assign(entropy_count, entropy_count)
-		tp_assign(entropy_total, entropy_total)
-		tp_assign(IP, IP)
-	),
-
-	TP_printk("%s pool: bits %d entropy_count %d entropy_total %d "
-		  "caller %pF", __get_str(pool_name), __entry->bits,
-		  __entry->entropy_count, __entry->entropy_total,
-		  (void *)__entry->IP)
+	TP_FIELDS(
+		ctf_string(pool_name, pool_name)
+		ctf_integer(int, bits, bits)
+		ctf_integer(int, entropy_count, entropy_count)
+		ctf_integer(int, entropy_total, entropy_total)
+		ctf_integer(unsigned long, IP, IP)
+	)
 )
+#endif
 
-TRACE_EVENT_MAP(get_random_bytes,
+LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes,
 
 	random_get_random_bytes,
 
@@ -85,46 +83,28 @@ TRACE_EVENT_MAP(get_random_bytes,
 
 	TP_ARGS(nbytes, IP),
 
-	TP_STRUCT__entry(
-		__field(	  int,	nbytes			)
-		__field(unsigned long,	IP			)
-	),
-
-	TP_fast_assign(
-		tp_assign(nbytes, nbytes)
-		tp_assign(IP, IP)
-	),
-
-	TP_printk("nbytes %d caller %pF", __entry->nbytes, (void *)__entry->IP)
+	TP_FIELDS(
+		ctf_integer(int, nbytes, nbytes)
+		ctf_integer(unsigned long, IP, IP)
+	)
 )
 
-DECLARE_EVENT_CLASS(random__extract_entropy,
+LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy,
 	TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
 		 unsigned long IP),
 
 	TP_ARGS(pool_name, nbytes, entropy_count, IP),
 
-	TP_STRUCT__entry(
-		__string(   pool_name,	pool_name		)
-		__field(	  int,	nbytes			)
-		__field(	  int,	entropy_count		)
-		__field(unsigned long,	IP			)
-	),
-
-	TP_fast_assign(
-		tp_strcpy(pool_name, pool_name)
-		tp_assign(nbytes, nbytes)
-		tp_assign(entropy_count, entropy_count)
-		tp_assign(IP, IP)
-	),
-
-	TP_printk("%s pool: nbytes %d entropy_count %d caller %pF",
-		  __get_str(pool_name), __entry->nbytes, __entry->entropy_count,
-		  (void *)__entry->IP)
+	TP_FIELDS(
+		ctf_string(pool_name, pool_name)
+		ctf_integer(int, nbytes, nbytes)
+		ctf_integer(int, entropy_count, entropy_count)
+		ctf_integer(unsigned long, IP, IP)
+	)
 )
 
 
-DEFINE_EVENT_MAP(random__extract_entropy, extract_entropy,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy,
 
 	random_extract_entropy,
 
@@ -134,7 +114,7 @@ DEFINE_EVENT_MAP(random__extract_entropy, extract_entropy,
 	TP_ARGS(pool_name, nbytes, entropy_count, IP)
 )
 
-DEFINE_EVENT_MAP(random__extract_entropy, extract_entropy_user,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy_user,
 
 	random_extract_entropy_user,
 
@@ -146,7 +126,7 @@ DEFINE_EVENT_MAP(random__extract_entropy, extract_entropy_user,
 
 
 
-#endif /* _TRACE_RANDOM_H */
+#endif /* LTTNG_TRACE_RANDOM_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>