X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fskb.h;h=bca4ff34c39966506473d0be835ba9ab4af43443;hb=b78104db53f97c10add30016e365855a26f6e01e;hp=3163356c5b7cc2899cbfaf5978f10a4b7ebd4636;hpb=d3ac4d63d21c643df5b09d9d7888eb0c4122379c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h
index 3163356c..bca4ff34 100644
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -1,75 +1,63 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM skb
 
-#if !defined(_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SKB_H
+#if !defined(LTTNG_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_SKB_H
 
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/tracepoint.h>
+#include <lttng-kernel-version.h>
 
 /*
  * Tracepoint for free an sk_buff:
  */
-TRACE_EVENT(kfree_skb,
+LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
+
+	skb_kfree,
 
 	TP_PROTO(struct sk_buff *skb, void *location),
 
 	TP_ARGS(skb, location),
 
-	TP_STRUCT__entry(
-		__field(	void *,		skbaddr		)
-		__field(	void *,		location	)
-		__field(	unsigned short,	protocol	)
-	),
-
-	TP_fast_assign(
-		tp_assign(skbaddr, skb)
-		tp_assign(location, location)
-		tp_assign(protocol, ntohs(skb->protocol))
-	),
-
-	TP_printk("skbaddr=%p protocol=%u location=%p",
-		__entry->skbaddr, __entry->protocol, __entry->location)
+	TP_FIELDS(
+		ctf_integer_hex(void *, skbaddr, skb)
+		ctf_integer_hex(void *, location, location)
+		ctf_integer_network(unsigned short, protocol, skb->protocol)
+	)
 )
 
-TRACE_EVENT(consume_skb,
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,37))
+LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
+
+	skb_consume,
 
 	TP_PROTO(struct sk_buff *skb),
 
 	TP_ARGS(skb),
 
-	TP_STRUCT__entry(
-		__field(	void *,	skbaddr	)
-	),
-
-	TP_fast_assign(
-		tp_assign(skbaddr, skb)
-	),
-
-	TP_printk("skbaddr=%p", __entry->skbaddr)
+	TP_FIELDS(
+		ctf_integer_hex(void *, skbaddr, skb)
+	)
 )
+#endif
 
-TRACE_EVENT(skb_copy_datagram_iovec,
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,32))
+LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
 
 	TP_PROTO(const struct sk_buff *skb, int len),
 
 	TP_ARGS(skb, len),
 
-	TP_STRUCT__entry(
-		__field(	const void *,		skbaddr		)
-		__field(	int,			len		)
-	),
-
-	TP_fast_assign(
-		tp_assign(skbaddr, skb)
-		tp_assign(len, len)
-	),
-
-	TP_printk("skbaddr=%p len=%d", __entry->skbaddr, __entry->len)
+	TP_FIELDS(
+		ctf_integer_hex(const void *, skbaddr, skb)
+		ctf_integer(int, len, len)
+	)
 )
+#endif
 
-#endif /* _TRACE_SKB_H */
+#endif /* LTTNG_TRACE_SKB_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>