X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Fheaders%2Fsyscalls_pointers_override.h;h=a552908e6add45001db99a717665b20ec416855f;hb=57ede728166a5a18a8cd9e70cb51e09d948f84a4;hp=6d06098f2ba2c9b40609b49798e38ad9c95189a0;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/syscalls/headers/syscalls_pointers_override.h b/instrumentation/syscalls/headers/syscalls_pointers_override.h
index 6d06098f..a552908e 100644
--- a/instrumentation/syscalls/headers/syscalls_pointers_override.h
+++ b/instrumentation/syscalls/headers/syscalls_pointers_override.h
@@ -6,15 +6,11 @@
 SC_LTTNG_TRACEPOINT_EVENT(execve,
 	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))
-		sc_in(__string_from_user(filename, filename))
-		sc_in(__field_hex(char *const *, argv))
-		sc_in(__field_hex(char *const *, envp))),
-	TP_fast_assign(sc_exit(tp_assign(ret, ret))
-		sc_in(tp_copy_string_from_user(filename, filename))
-		sc_in(tp_assign(argv, argv))
-		sc_in(tp_assign(envp, envp))),
-	TP_printk()
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_user_string(filename, filename))
+		sc_in(ctf_integer_hex(char *const *, argv, argv))
+		sc_in(ctf_integer_hex(char *const *, envp, envp))
+	)
 )
 
 SC_LTTNG_TRACEPOINT_EVENT(clone,
@@ -22,19 +18,13 @@ SC_LTTNG_TRACEPOINT_EVENT(clone,
 		void __user *parent_tid,
 		void __user *child_tid),
 	TP_ARGS(sc_exit(ret,) clone_flags, newsp, parent_tid, child_tid),
-	TP_STRUCT__entry(
-		sc_exit(__field(long, ret))
-		sc_in(__field_hex(unsigned long, clone_flags))
-		sc_in(__field_hex(unsigned long, newsp))
-		sc_in(__field_hex(void *, parent_tid))
-		sc_in(__field_hex(void *, child_tid))),
-	TP_fast_assign(
-		sc_exit(tp_assign(ret, ret))
-		sc_in(tp_assign(clone_flags, clone_flags))
-		sc_in(tp_assign(newsp, newsp))
-		sc_in(tp_assign(parent_tid, parent_tid))
-		sc_in(tp_assign(child_tid, child_tid))),
-	TP_printk()
+	TP_FIELDS(
+		sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer_hex(unsigned long, clone_flags, clone_flags))
+		sc_in(ctf_integer_hex(unsigned long, newsp, newsp))
+		sc_in(ctf_integer_hex(void *, parent_tid, parent_tid))
+		sc_in(ctf_integer_hex(void *, child_tid, child_tid))
+	)
 )
 
 /* present in 32, missing in 64 due to old kernel headers */
@@ -43,17 +33,12 @@ SC_LTTNG_TRACEPOINT_EVENT(clone,
 SC_LTTNG_TRACEPOINT_EVENT(getcpu,
 	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))
-		sc_out(__field_hex(unsigned *, cpup))
-		sc_out(__field_hex(unsigned *, nodep))
-		sc_inout(__field_hex(void *, tcache))),
-	TP_fast_assign(
-		sc_exit(tp_assign(ret, ret))
-		sc_out(tp_assign(cpup, cpup))
-		sc_out(tp_assign(nodep, nodep))
-		sc_inout(tp_assign(tcache, tcache))),
-	TP_printk()
+	TP_FIELDS(
+		sc_exit(ctf_integer(long, ret, ret))
+		sc_out(ctf_integer_hex(unsigned *, cpup, cpup))
+		sc_out(ctf_integer_hex(unsigned *, nodep, nodep))
+		sc_inout(ctf_integer_hex(void *, tcache, tcache))
+	)
 )
 
 #define OVERRIDE_32_pipe
@@ -61,13 +46,9 @@ SC_LTTNG_TRACEPOINT_EVENT(getcpu,
 SC_LTTNG_TRACEPOINT_EVENT(pipe,
 	TP_PROTO(sc_exit(long ret,) int * fildes),
 	TP_ARGS(sc_exit(ret,) fildes),
-	TP_STRUCT__entry(sc_exit(__field(long, ret))
-		sc_out(__array(int, fildes, 2))
-	),
-	TP_fast_assign(sc_exit(tp_assign(ret, ret))
-		sc_out(tp_memcpy_from_user(fildes, fildes, 2))
-	),
-	TP_printk()
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_out(ctf_user_array(int, fildes, fildes, 2))
+	)
 )
 
 #define OVERRIDE_32_pipe2
@@ -75,15 +56,10 @@ SC_LTTNG_TRACEPOINT_EVENT(pipe,
 SC_LTTNG_TRACEPOINT_EVENT(pipe2,
 	TP_PROTO(sc_exit(long ret,) int * fildes, int flags),
 	TP_ARGS(sc_exit(ret,) fildes, flags),
-	TP_STRUCT__entry(sc_exit(__field(long, ret))
-		sc_out(__array(int, fildes, 2))
-		sc_in(__field(int, flags))
-	),
-	TP_fast_assign(sc_exit(tp_assign(ret, ret))
-		sc_out(tp_memcpy_from_user(fildes, fildes, 2))
-		sc_in(tp_assign(flags, flags))
-	),
-	TP_printk()
+	TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+		sc_out(ctf_user_array(int, fildes, fildes, 2))
+		sc_in(ctf_integer(int, flags, flags))
+	)
 )
 
 #endif /* CREATE_SYSCALL_TABLE */