X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Frandom.h;h=eaea2973fe94b05e8248e957689e9cc126f16f32;hb=2c054599f20c4abba83e11221d71056dc15448cf;hp=f165600000f88ac710b2f3667a7f02f234a40538;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h
index f1656000..eaea2973 100644
--- a/instrumentation/events/lttng-module/random.h
+++ b/instrumentation/events/lttng-module/random.h
@@ -16,7 +16,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes,
 	TP_FIELDS(
 		ctf_string(pool_name, pool_name)
 		ctf_integer(int, bytes, bytes)
-		ctf_integer(unsigned long, IP, IP)
+		ctf_integer_hex(unsigned long, IP, IP)
 	)
 )
 
@@ -38,6 +38,24 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes_noloc
 	TP_ARGS(pool_name, bytes, IP)
 )
 
+#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_hex(unsigned long, IP, IP)
+	)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
 
 	random_credit_entropy_bits,
@@ -52,9 +70,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
 		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)
+		ctf_integer_hex(unsigned long, IP, IP)
 	)
 )
+#endif
 
 LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes,
 
@@ -66,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes,
 
 	TP_FIELDS(
 		ctf_integer(int, nbytes, nbytes)
-		ctf_integer(unsigned long, IP, IP)
+		ctf_integer_hex(unsigned long, IP, IP)
 	)
 )
 
@@ -80,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy,
 		ctf_string(pool_name, pool_name)
 		ctf_integer(int, nbytes, nbytes)
 		ctf_integer(int, entropy_count, entropy_count)
-		ctf_integer(unsigned long, IP, IP)
+		ctf_integer_hex(unsigned long, IP, IP)
 	)
 )