Fix: Move pipe override to the arch specific pointers_override.h

The MIPS architecture has a non-standard calling convention for pipe()
and cannot use the provided override for the pipe event.

Signed-off-by: Lars Persson <larper@axis.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers_override.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers_override.h
index d515e1d06ba4303894a0b699aa653f2cd515431d..b27eedbcbacf8961de025ade1e0b25eb97144176 100644 (file)
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers_override.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers_override.h
@@ -18,6 +18,15 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap2,
        )
 )
 
+#define OVERRIDE_32_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))
+       )
+)
+
 #else  /* CREATE_SYSCALL_TABLE */
 
 #define OVERRIDE_TABLE_32_execve

diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers_override.h b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers_override.h
index b9e83bc4cf1581afc3215e3105b65618e781498f..1fd3ec45e598b03ccc415d15fcdd0d8b88638d42 100644 (file)
--- a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers_override.h
+++ b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers_override.h
@@ -16,6 +16,15 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap2,
        )
 )
 
+#define OVERRIDE_32_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))
+       )
+)
+
 #else  /* CREATE_SYSCALL_TABLE */
 
 #define OVERRIDE_TABLE_32_execve

diff --git a/instrumentation/syscalls/headers/syscalls_pointers_override.h b/instrumentation/syscalls/headers/syscalls_pointers_override.h
index a552908e6add45001db99a717665b20ec416855f..c9478f44f79f156776fd2bb72bcc8e313cbe316b 100644 (file)
--- a/instrumentation/syscalls/headers/syscalls_pointers_override.h
+++ b/instrumentation/syscalls/headers/syscalls_pointers_override.h
@@ -41,16 +41,6 @@ SC_LTTNG_TRACEPOINT_EVENT(getcpu,
        )
 )
 
-#define OVERRIDE_32_pipe
-#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))
-       )
-)
-
 #define OVERRIDE_32_pipe2
 #define OVERRIDE_64_pipe2
 SC_LTTNG_TRACEPOINT_EVENT(pipe2,

diff --git a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers_override.h b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers_override.h
index 05c8e21796f3344b9acb273c112ea592321697e5..7c804a67e3cb445a5484da4e3d8bf369d8bb5e7a 100644 (file)
--- a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers_override.h
+++ b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers_override.h
@@ -10,6 +10,16 @@
 #  define OVERRIDE_32_chown16
 # endif
 
+#define OVERRIDE_32_pipe
+#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))
+    )
+)
+
 #else  /* CREATE_SYSCALL_TABLE */
 
 # ifndef CONFIG_UID16

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 af519cd6ecaee9e3b208eac1bb82dbd0cd97077c..702cfb5d710b835896f86ffc5482d998896e69b8 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
@@ -106,6 +106,15 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
        )
 )
 
+#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))
+       )
+)
+
 #else  /* CREATE_SYSCALL_TABLE */
 
 #define OVERRIDE_TABLE_64_clone