tracepoint: Refactor representation of nested types

[lttng-modules.git] / instrumentation / events / lttng-module / random.h

diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h
index ce6c760c2f4c98a06363a46da8572343135d7abe..621d5e72e99ba7a5f4320c9a9324c5b41774b82c 100644 (file)
--- a/instrumentation/events/lttng-module/random.h
+++ b/instrumentation/events/lttng-module/random.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM random
 
@@ -15,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)
        )
 )
 
@@ -37,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,
@@ -51,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,
 
@@ -65,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)
        )
 )
 
@@ -79,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)
        )
 )