X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsock.h;h=de903d68fcc31bfd8835f9d478d7de4462c862e6;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=b0c7411470404c3fa798c29cb555e224c7062422;hpb=253be6ef8104b27e65fbd634adcaa3fd947a9efb;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
index b0c74114..de903d68 100644
--- a/instrumentation/events/lttng-module/sock.h
+++ b/instrumentation/events/lttng-module/sock.h
@@ -1,68 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #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 <lttng-kernel-version.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),
 
 	TP_ARGS(sk, skb),
 
-	TP_STRUCT__entry(
-		__field(int, rmem_alloc)
-		__field(unsigned int, truesize)
-		__field(int, sk_rcvbuf)
-	),
+	TP_FIELDS(
+		ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+		ctf_integer(unsigned int, truesize, skb->truesize)
+		ctf_integer(int, sk_rcvbuf, sk->sk_rcvbuf)
+	)
+)
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,19,0))
+
+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
+
+	TP_PROTO(struct sock *sk, struct proto *prot, long allocated, int kind),
+
+	TP_ARGS(sk, prot, allocated, kind),
+
+	TP_FIELDS(
+		ctf_string(name, prot->name)
+		ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
+		ctf_integer(long, allocated, allocated)
+		ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
+		ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+		ctf_integer(int, sysctl_wmem, sk_get_wmem0(sk, prot))
+		ctf_integer(int, wmem_alloc, refcount_read(&sk->sk_wmem_alloc))
+		ctf_integer(int, wmem_queued, sk->sk_wmem_queued)
+		ctf_integer(int, kind, kind)
+	)
+)
 
-	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)
-	),
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0))
 
-	TP_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d",
-		__entry->rmem_alloc, __entry->truesize, __entry->sk_rcvbuf)
+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
+
+	TP_PROTO(struct sock *sk, struct proto *prot, long allocated),
+
+	TP_ARGS(sk, prot, allocated),
+
+	TP_FIELDS(
+		ctf_string(name, prot->name)
+		ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
+		ctf_integer(long, allocated, allocated)
+		ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
+		ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+	)
 )
 
-TRACE_EVENT(sock_exceed_buf_limit,
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) */
+
+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
 
 	TP_PROTO(struct sock *sk, struct proto *prot, long allocated),
 
 	TP_ARGS(sk, prot, allocated),
 
-	TP_STRUCT__entry(
-		__string(name, prot->name)
-		__field(long *, sysctl_mem)
-		__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_printk("proto:%s sysctl_mem=%ld,%ld,%ld allocated=%ld "
-		"sysctl_rmem=%d rmem_alloc=%d",
-		__entry->name,
-		__entry->sysctl_mem[0],
-		__entry->sysctl_mem[1],
-		__entry->sysctl_mem[2],
-		__entry->allocated,
-		__entry->sysctl_rmem,
-		__entry->rmem_alloc)
+	TP_FIELDS(
+		ctf_string(name, prot->name)
+		ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
+		ctf_integer(long, allocated, allocated)
+		ctf_integer(int, sysctl_rmem, prot->sysctl_rmem[0])
+		ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+	)
 )
 
-#endif /* _TRACE_SOCK_H */
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) */
+
+#endif /* LTTNG_TRACE_SOCK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>