Migrate tracepoint instrumentation to TP_FIELDS

[lttng-modules.git] / instrumentation / events / lttng-module / sock.h

diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
index 3f48fa3644269e768b98da663666f2fbc2509c2d..c9bf4bf76094e366e26f8520069b524f880ac5b1 100644 (file)
--- a/instrumentation/events/lttng-module/sock.h
+++ b/instrumentation/events/lttng-module/sock.h
@@ -13,20 +13,11 @@ LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
 
        TP_ARGS(sk, skb),
 
-       TP_STRUCT__entry(
-               __field(int, rmem_alloc)
-               __field(unsigned int, truesize)
-               __field(int, sk_rcvbuf)
-       ),
-
-       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_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d",
-               __entry->rmem_alloc, __entry->truesize, __entry->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)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
@@ -35,31 +26,13 @@ LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
 
        TP_ARGS(sk, prot, allocated),
 
-       TP_STRUCT__entry(
-               __string(name, prot->name)
-               __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_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 "
-               "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 /* LTTNG_TRACE_SOCK_H */