X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Fheaders%2Fsyscalls_pointers_override.h;h=a6721f1a9ee33ad30ba5d54e71dd34386226ef8f;hb=e17f92ba9400ea4c8153da492505926e0fbeac73;hp=a24c4d315db2c2c6bfa4c11b938865ae64a90c2b;hpb=fc4f71617faa8894d4a32a1e40e10aa74647a949;p=lttng-modules.git

diff --git a/instrumentation/syscalls/headers/syscalls_pointers_override.h b/instrumentation/syscalls/headers/syscalls_pointers_override.h
index a24c4d31..a6721f1a 100644
--- a/instrumentation/syscalls/headers/syscalls_pointers_override.h
+++ b/instrumentation/syscalls/headers/syscalls_pointers_override.h
@@ -4,28 +4,32 @@
 #ifndef CREATE_SYSCALL_TABLE
 
 SC_TRACE_EVENT(sys_execve,
-	TP_PROTO(const char *filename, char *const *argv, char *const *envp),
-	TP_ARGS(filename, argv, envp),
-	TP_STRUCT__entry(__string_from_user(filename, filename)
+	TP_PROTO(sc_exit(long ret,) const char *filename, char *const *argv, char *const *envp),
+	TP_ARGS(sc_exit(ret,) filename, argv, envp),
+	TP_STRUCT__entry(sc_exit(__field(long, ret))
+		__string_from_user(filename, filename)
 		__field_hex(char *const *, argv)
 		__field_hex(char *const *, envp)),
-	TP_fast_assign(tp_copy_string_from_user(filename, filename)
+	TP_fast_assign(sc_exit(tp_assign(ret, ret))
+		tp_copy_string_from_user(filename, filename)
 		tp_assign(argv, argv)
 		tp_assign(envp, envp)),
 	TP_printk()
 )
 
 SC_TRACE_EVENT(sys_clone,
-	TP_PROTO(unsigned long clone_flags, unsigned long newsp,
+	TP_PROTO(sc_exit(long ret,) unsigned long clone_flags, unsigned long newsp,
 		void __user *parent_tid,
 		void __user *child_tid),
-	TP_ARGS(clone_flags, newsp, parent_tid, child_tid),
+	TP_ARGS(sc_exit(ret,) clone_flags, newsp, parent_tid, child_tid),
 	TP_STRUCT__entry(
+		sc_exit(__field(long, ret))
 		__field_hex(unsigned long, clone_flags)
 		__field_hex(unsigned long, newsp)
 		__field_hex(void *, parent_tid)
 		__field_hex(void *, child_tid)),
 	TP_fast_assign(
+		sc_exit(tp_assign(ret, ret))
 		tp_assign(clone_flags, clone_flags)
 		tp_assign(newsp, newsp)
 		tp_assign(parent_tid, parent_tid)
@@ -37,13 +41,15 @@ SC_TRACE_EVENT(sys_clone,
 #define OVERRIDE_32_sys_getcpu
 #define OVERRIDE_64_sys_getcpu
 SC_TRACE_EVENT(sys_getcpu,
-	TP_PROTO(unsigned __user *cpup, unsigned __user *nodep, void *tcache),
-	TP_ARGS(cpup, nodep, tcache),
+	TP_PROTO(sc_exit(long ret,) unsigned __user *cpup, unsigned __user *nodep, void *tcache),
+	TP_ARGS(sc_exit(ret,) cpup, nodep, tcache),
 	TP_STRUCT__entry(
+		sc_exit(__field(long, ret))
 		__field_hex(unsigned *, cpup)
 		__field_hex(unsigned *, nodep)
 		__field_hex(void *, tcache)),
 	TP_fast_assign(
+		sc_exit(tp_assign(ret, ret))
 		tp_assign(cpup, cpup)
 		tp_assign(nodep, nodep)
 		tp_assign(tcache, tcache)),