X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=f4a0d97ee13b2c92cced3906579ec6d3f6e3b683;hb=f127e61ee231d002fb9a7803643a157e06f6d2e2;hp=c25b0d92f6b416084592d44a058ebb6775e8efd4;hpb=b283666ff19841a28b0448c6a867beb2f809f11a;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index c25b0d92..f4a0d97e 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -1,84 +1,77 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM net
 
-#if !defined(_TRACE_NET_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_NET_H
+#if !defined(LTTNG_TRACE_NET_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_NET_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/ip.h>
-#include <linux/tracepoint.h>
+#include <linux/version.h>
 
-TRACE_EVENT(net_dev_xmit,
+LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
 	TP_PROTO(struct sk_buff *skb,
 		 int rc,
 		 struct net_device *dev,
 		 unsigned int skb_len),
 
 	TP_ARGS(skb, rc, dev, skb_len),
-
-	TP_STRUCT__entry(
-		__field(	void *,		skbaddr		)
-		__field(	unsigned int,	len		)
-		__field(	int,		rc		)
-		__string(	name,		dev->name	)
-	),
-
-	TP_fast_assign(
-		tp_assign(skbaddr, skb);
-		tp_assign(len, skb_len);
-		tp_assign(rc, rc);
-		tp_strcpy(name, dev->name);
-	),
-
-	TP_printk("dev=%s skbaddr=%p len=%u rc=%d",
-		__get_str(name), __entry->skbaddr, __entry->len, __entry->rc)
+#else
+	TP_PROTO(struct sk_buff *skb,
+		 int rc),
+	
+	TP_ARGS(skb, rc),
+#endif
+
+	TP_FIELDS(
+		ctf_integer(void *, skbaddr, skb)
+		ctf_integer(unsigned int, len, skb_len)
+		ctf_integer(int, rc, rc)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
+		ctf_string(name, dev->name)
+#else
+		ctf_string(name, skb->dev->name)
+#endif
+	)
 )
 
-DECLARE_EVENT_CLASS(net_dev_template,
+LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template,
 
 	TP_PROTO(struct sk_buff *skb),
 
 	TP_ARGS(skb),
 
-	TP_STRUCT__entry(
-		__field(	void *,		skbaddr		)
-		__field(	unsigned int,	len		)
-		__string(	name,		skb->dev->name	)
-	),
-
-	TP_fast_assign(
-		tp_assign(skbaddr, skb);
-		tp_assign(len, skb->len);
-		tp_strcpy(name, skb->dev->name);
-	),
-
-	TP_printk("dev=%s skbaddr=%p len=%u",
-		__get_str(name), __entry->skbaddr, __entry->len)
+	TP_FIELDS(
+		ctf_integer(void *, skbaddr, skb)
+		ctf_integer(unsigned int, len, skb->len)
+		ctf_string(name, skb->dev->name)
+	)
 )
 
-DEFINE_EVENT(net_dev_template, net_dev_queue,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, net_dev_queue,
 
 	TP_PROTO(struct sk_buff *skb),
 
 	TP_ARGS(skb)
 )
 
-DEFINE_EVENT(net_dev_template, netif_receive_skb,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, netif_receive_skb,
 
 	TP_PROTO(struct sk_buff *skb),
 
 	TP_ARGS(skb)
 )
 
-DEFINE_EVENT(net_dev_template, netif_rx,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, netif_rx,
 
 	TP_PROTO(struct sk_buff *skb),
 
 	TP_ARGS(skb)
 )
-#endif /* _TRACE_NET_H */
+#endif /* LTTNG_TRACE_NET_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"