Fix: incorrect rwbs field type in block_bio_queue

[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 246ea58ca3fdcebe9e00315988a3283d796ffc35..3e3dbc72e804b3e910da8af3850e0c67a326543a 100644 (file)
--- a/instrumentation/events/lttng-module/sock.h
+++ b/instrumentation/events/lttng-module/sock.h
@@ -20,9 +20,9 @@ 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",
@@ -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 "