X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=instrumentation%2Fevents%2Flttng-module%2Fsock.h;h=3f48fa3644269e768b98da663666f2fbc2509c2d;hb=2cf0c2ca8759ed6103b5aab149efea34e6986818;hp=246ea58ca3fdcebe9e00315988a3283d796ffc35;hpb=b283666ff19841a28b0448c6a867beb2f809f11a;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
index 246ea58c..3f48fa36 100644
--- a/instrumentation/events/lttng-module/sock.h
+++ b/instrumentation/events/lttng-module/sock.h
@@ -1,13 +1,13 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sock
 
-#if !defined(_TRACE_SOCK_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SOCK_H
+#if !defined(LTTNG_TRACE_SOCK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_SOCK_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <net/sock.h>
-#include <linux/tracepoint.h>
 
-TRACE_EVENT(sock_rcvqueue_full,
+LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
 
 	TP_PROTO(struct sock *sk, struct sk_buff *skb),
 
@@ -20,16 +20,16 @@ TRACE_EVENT(sock_rcvqueue_full,
 	),
 
 	TP_fast_assign(
-		tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc));
-		tp_assign(truesize, skb->truesize);
-		tp_assign(sk_rcvbuf, sk->sk_rcvbuf);
+		tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+		tp_assign(truesize, skb->truesize)
+		tp_assign(sk_rcvbuf, sk->sk_rcvbuf)
 	),
 
 	TP_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d",
 		__entry->rmem_alloc, __entry->truesize, __entry->sk_rcvbuf)
 )
 
-TRACE_EVENT(sock_exceed_buf_limit,
+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
 
 	TP_PROTO(struct sock *sk, struct proto *prot, long allocated),
 
@@ -37,18 +37,18 @@ TRACE_EVENT(sock_exceed_buf_limit,
 
 	TP_STRUCT__entry(
 		__string(name, prot->name)
-		__field(long *, sysctl_mem)
+		__array(long, sysctl_mem, 3)
 		__field(long, allocated)
 		__field(int, sysctl_rmem)
 		__field(int, rmem_alloc)
 	),
 
 	TP_fast_assign(
-		tp_strcpy(name, prot->name);
-		tp_assign(sysctl_mem, prot->sysctl_mem);
-		tp_assign(allocated, allocated);
-		tp_assign(sysctl_rmem, prot->sysctl_rmem[0]);
-		tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc));
+		tp_strcpy(name, prot->name)
+		tp_memcpy(sysctl_mem, prot->sysctl_mem, 3 * sizeof(long))
+		tp_assign(allocated, allocated)
+		tp_assign(sysctl_rmem, prot->sysctl_rmem[0])
+		tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
 	),
 
 	TP_printk("proto:%s sysctl_mem=%ld,%ld,%ld allocated=%ld "
@@ -62,7 +62,7 @@ TRACE_EVENT(sock_exceed_buf_limit,
 		__entry->rmem_alloc)
 )
 
-#endif /* _TRACE_SOCK_H */
+#endif /* LTTNG_TRACE_SOCK_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"