X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Frandom.h;h=910ea9149b133555a34f56aa47e1c62941e8f673;hb=9e8bcbf975844986f021e99e2a30ceedc41b46a8;hp=6ecdd90e7e2dcd4b0a865b50dde032d8afa27ab6;hpb=b87700e318c27267890cbd6fb5e50b687279131b;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h
index 6ecdd90e..910ea914 100644
--- a/instrumentation/events/lttng-module/random.h
+++ b/instrumentation/events/lttng-module/random.h
@@ -1,13 +1,13 @@
 #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),
@@ -28,19 +28,28 @@ DECLARE_EVENT_CLASS(random__mix_pool_bytes,
 		  __get_str(pool_name), __entry->bytes, (void *)__entry->IP)
 )
 
-DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes,
+
+	random_mix_pool_bytes,
+
 	TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
 
 	TP_ARGS(pool_name, bytes, IP)
 )
 
-DEFINE_EVENT(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,
+
 	TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
 
 	TP_ARGS(pool_name, bytes, IP)
 )
 
-TRACE_EVENT(credit_entropy_bits,
+LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
+
+	random_credit_entropy_bits,
+
 	TP_PROTO(const char *pool_name, int bits, int entropy_count,
 		 int entropy_total, unsigned long IP),
 
@@ -68,7 +77,10 @@ TRACE_EVENT(credit_entropy_bits,
 		  (void *)__entry->IP)
 )
 
-TRACE_EVENT(get_random_bytes,
+LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes,
+
+	random_get_random_bytes,
+
 	TP_PROTO(int nbytes, unsigned long IP),
 
 	TP_ARGS(nbytes, IP),
@@ -86,7 +98,7 @@ TRACE_EVENT(get_random_bytes,
 	TP_printk("nbytes %d caller %pF", __entry->nbytes, (void *)__entry->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),
 
@@ -112,14 +124,20 @@ DECLARE_EVENT_CLASS(random__extract_entropy,
 )
 
 
-DEFINE_EVENT(random__extract_entropy, extract_entropy,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy,
+
+	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)
 )
 
-DEFINE_EVENT(random__extract_entropy, extract_entropy_user,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy_user,
+
+	random_extract_entropy_user,
+
 	TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
 		 unsigned long IP),
 
@@ -128,7 +146,7 @@ DEFINE_EVENT(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"