Fix: x86-64 accept instrumentation

[lttng-modules.git] / instrumentation / syscalls / headers / x86-64-syscalls-3.10.0-rc7_pointers_override.h

diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
index f656b3a62e769cb96c213e154330cf5a61586c79..40fa930accb7f22efe99fe1ca1a61fa96f97abc6 100644 (file)
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
@@ -9,9 +9,9 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(connect,
                uint16_t dport;
                uint32_t v4addr;
                uint16_t v6addr[8];
-               int v4addr_len, v6addr_len;
+               unsigned int v4addr_len, v6addr_len;
        ),
-       TP_code(
+       TP_code_pre(
                sc_in(
                        memset(tp_locvar, 0, sizeof(*tp_locvar));
                        if (addrlen < sizeof(struct sockaddr))
@@ -46,9 +46,10 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(connect,
                sc_in(ctf_integer_hex(int, addrlen, addrlen))
                sc_in(ctf_integer(int, family, tp_locvar->sa_family))
                sc_in(ctf_integer_network(uint16_t, dport, tp_locvar->dport))
-               sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, int, tp_locvar->v4addr_len))
-               sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, int, tp_locvar->v6addr_len))
-       )
+               sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
+               sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
+       ),
+       TP_code_post()
 )
 
 #define OVERRIDE_64_accept
@@ -63,7 +64,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
                int v4addr_len, v6addr_len;
                int uaddr_len;
        ),
-       TP_code(
+       TP_code_pre(
                sc_inout(
                        memset(tp_locvar, 0, sizeof(*tp_locvar));
                        (void) get_user(tp_locvar->uaddr_len, upeer_addrlen);
@@ -101,8 +102,18 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
                sc_inout(ctf_integer(int, upeer_addrlen, tp_locvar->uaddr_len))
                sc_out(ctf_integer(int, family, tp_locvar->sa_family))
                sc_out(ctf_integer_network(uint16_t, sport, tp_locvar->sport))
-               sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, int, tp_locvar->v4addr_len))
-               sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, int, tp_locvar->v6addr_len))
+               sc_out(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
+               sc_out(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
+       ),
+       TP_code_post()
+)
+
+#define OVERRIDE_64_pipe
+SC_LTTNG_TRACEPOINT_EVENT(pipe,
+       TP_PROTO(sc_exit(long ret,) int * fildes),
+       TP_ARGS(sc_exit(ret,) fildes),
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+               sc_out(ctf_user_array(int, fildes, fildes, 2))
        )
 )