Migrate ARM, powerpc, MIPS syscall instrumentation to TP_FIELDS

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h
index 941f935977ce60c13a85199d46021dde6c654beb..7fd7ddedcac4766f740b4511eaa6403d230c0753 100644 (file)
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h
@@ -11,9 +11,7 @@
 
 #ifdef SC_ENTER
 SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscalls_noargs,
-       TP_STRUCT__entry(),
-       TP_fast_assign(),
-       TP_printk()
+       TP_FIELDS()
 )
 #ifndef OVERRIDE_32_restart_syscall
 SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, restart_syscall)
@@ -80,180 +78,140 @@ SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, inotify_init)
 SC_LTTNG_TRACEPOINT_EVENT(restart_syscall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getpid
 SC_LTTNG_TRACEPOINT_EVENT(getpid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getuid16
 SC_LTTNG_TRACEPOINT_EVENT(getuid16,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_pause
 SC_LTTNG_TRACEPOINT_EVENT(pause,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sync
 SC_LTTNG_TRACEPOINT_EVENT(sync,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getgid16
 SC_LTTNG_TRACEPOINT_EVENT(getgid16,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_geteuid16
 SC_LTTNG_TRACEPOINT_EVENT(geteuid16,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getegid16
 SC_LTTNG_TRACEPOINT_EVENT(getegid16,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getppid
 SC_LTTNG_TRACEPOINT_EVENT(getppid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getpgrp
 SC_LTTNG_TRACEPOINT_EVENT(getpgrp,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_setsid
 SC_LTTNG_TRACEPOINT_EVENT(setsid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_vhangup
 SC_LTTNG_TRACEPOINT_EVENT(vhangup,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_munlockall
 SC_LTTNG_TRACEPOINT_EVENT(munlockall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_yield
 SC_LTTNG_TRACEPOINT_EVENT(sched_yield,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getuid
 SC_LTTNG_TRACEPOINT_EVENT(getuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getgid
 SC_LTTNG_TRACEPOINT_EVENT(getgid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_geteuid
 SC_LTTNG_TRACEPOINT_EVENT(geteuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getegid
 SC_LTTNG_TRACEPOINT_EVENT(getegid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_gettid
 SC_LTTNG_TRACEPOINT_EVENT(gettid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_init
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #endif /* else #ifdef SC_ENTER */
@@ -261,774 +219,602 @@ SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
 SC_LTTNG_TRACEPOINT_EVENT(exit,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_32_close
 SC_LTTNG_TRACEPOINT_EVENT(close,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_setuid16
 SC_LTTNG_TRACEPOINT_EVENT(setuid16,
        TP_PROTO(sc_exit(long ret,) old_uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_nice
 SC_LTTNG_TRACEPOINT_EVENT(nice,
        TP_PROTO(sc_exit(long ret,) int increment),
        TP_ARGS(sc_exit(ret,) increment),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, increment))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(increment, increment))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, increment, increment)))
 )
 #endif
 #ifndef OVERRIDE_32_dup
 SC_LTTNG_TRACEPOINT_EVENT(dup,
        TP_PROTO(sc_exit(long ret,) unsigned int fildes),
        TP_ARGS(sc_exit(ret,) fildes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fildes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fildes, fildes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fildes, fildes)))
 )
 #endif
 #ifndef OVERRIDE_32_brk
 SC_LTTNG_TRACEPOINT_EVENT(brk,
        TP_PROTO(sc_exit(long ret,) unsigned long brk),
        TP_ARGS(sc_exit(ret,) brk),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, brk))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(brk, brk))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, brk, brk)))
 )
 #endif
 #ifndef OVERRIDE_32_setgid16
 SC_LTTNG_TRACEPOINT_EVENT(setgid16,
        TP_PROTO(sc_exit(long ret,) old_gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_umask
 SC_LTTNG_TRACEPOINT_EVENT(umask,
        TP_PROTO(sc_exit(long ret,) int mask),
        TP_ARGS(sc_exit(ret,) mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_32_fsync
 SC_LTTNG_TRACEPOINT_EVENT(fsync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_getpgid
 SC_LTTNG_TRACEPOINT_EVENT(getpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_fchdir
 SC_LTTNG_TRACEPOINT_EVENT(fchdir,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_personality
 SC_LTTNG_TRACEPOINT_EVENT(personality,
        TP_PROTO(sc_exit(long ret,) unsigned int personality),
        TP_ARGS(sc_exit(ret,) personality),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, personality))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(personality, personality))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, personality, personality)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsuid16
 SC_LTTNG_TRACEPOINT_EVENT(setfsuid16,
        TP_PROTO(sc_exit(long ret,) old_uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsgid16
 SC_LTTNG_TRACEPOINT_EVENT(setfsgid16,
        TP_PROTO(sc_exit(long ret,) old_gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_getsid
 SC_LTTNG_TRACEPOINT_EVENT(getsid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_fdatasync
 SC_LTTNG_TRACEPOINT_EVENT(fdatasync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_mlockall
 SC_LTTNG_TRACEPOINT_EVENT(mlockall,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_getscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_get_priority_max
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_max,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_get_priority_min
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_min,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_32_setuid
 SC_LTTNG_TRACEPOINT_EVENT(setuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_setgid
 SC_LTTNG_TRACEPOINT_EVENT(setgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsuid
 SC_LTTNG_TRACEPOINT_EVENT(setfsuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsgid
 SC_LTTNG_TRACEPOINT_EVENT(setfsgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_io_destroy
 SC_LTTNG_TRACEPOINT_EVENT(io_destroy,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx),
        TP_ARGS(sc_exit(ret,) ctx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx, ctx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx, ctx)))
 )
 #endif
 #ifndef OVERRIDE_32_exit_group
 SC_LTTNG_TRACEPOINT_EVENT(exit_group,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_create
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create,
        TP_PROTO(sc_exit(long ret,) int size),
        TP_ARGS(sc_exit(ret,) size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_getoverrun
 SC_LTTNG_TRACEPOINT_EVENT(timer_getoverrun,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_delete
 SC_LTTNG_TRACEPOINT_EVENT(timer_delete,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_unshare
 SC_LTTNG_TRACEPOINT_EVENT(unshare,
        TP_PROTO(sc_exit(long ret,) unsigned long unshare_flags),
        TP_ARGS(sc_exit(ret,) unshare_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, unshare_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unshare_flags, unshare_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, unshare_flags, unshare_flags)))
 )
 #endif
 #ifndef OVERRIDE_32_eventfd
 SC_LTTNG_TRACEPOINT_EVENT(eventfd,
        TP_PROTO(sc_exit(long ret,) unsigned int count),
        TP_ARGS(sc_exit(ret,) count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_create1
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_init1
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_syncfs
 SC_LTTNG_TRACEPOINT_EVENT(syncfs,
        TP_PROTO(sc_exit(long ret,) int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_kill
 SC_LTTNG_TRACEPOINT_EVENT(kill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_setpgid
 SC_LTTNG_TRACEPOINT_EVENT(setpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, pid_t pgid),
        TP_ARGS(sc_exit(ret,) pid, pgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(pid_t, pgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(pgid, pgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(pid_t, pgid, pgid)))
 )
 #endif
 #ifndef OVERRIDE_32_dup2
 SC_LTTNG_TRACEPOINT_EVENT(dup2,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd),
        TP_ARGS(sc_exit(ret,) oldfd, newfd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)))
 )
 #endif
 #ifndef OVERRIDE_32_setreuid16
 SC_LTTNG_TRACEPOINT_EVENT(setreuid16,
        TP_PROTO(sc_exit(long ret,) old_uid_t ruid, old_uid_t euid),
        TP_ARGS(sc_exit(ret,) ruid, euid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_uid_t, ruid)) sc_inout(__field(old_uid_t, euid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ruid, ruid)) sc_inout(tp_assign(euid, euid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_uid_t, ruid, ruid)) sc_inout(ctf_integer(old_uid_t, euid, euid)))
 )
 #endif
 #ifndef OVERRIDE_32_setregid16
 SC_LTTNG_TRACEPOINT_EVENT(setregid16,
        TP_PROTO(sc_exit(long ret,) old_gid_t rgid, old_gid_t egid),
        TP_ARGS(sc_exit(ret,) rgid, egid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_gid_t, rgid)) sc_inout(__field(old_gid_t, egid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(rgid, rgid)) sc_inout(tp_assign(egid, egid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_gid_t, rgid, rgid)) sc_inout(ctf_integer(old_gid_t, egid, egid)))
 )
 #endif
 #ifndef OVERRIDE_32_munmap
 SC_LTTNG_TRACEPOINT_EVENT(munmap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, size_t len),
        TP_ARGS(sc_exit(ret,) addr, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_ftruncate
 SC_LTTNG_TRACEPOINT_EVENT(ftruncate,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long length),
        TP_ARGS(sc_exit(ret,) fd, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_fchmod
 SC_LTTNG_TRACEPOINT_EVENT(fchmod,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, umode_t mode),
        TP_ARGS(sc_exit(ret,) fd, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_getpriority
 SC_LTTNG_TRACEPOINT_EVENT(getpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_32_bdflush
 SC_LTTNG_TRACEPOINT_EVENT(bdflush,
        TP_PROTO(sc_exit(long ret,) int func, long data),
        TP_ARGS(sc_exit(ret,) func, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, func)) sc_inout(__field(long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(func, func)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, func, func)) sc_inout(ctf_integer(long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_flock
 SC_LTTNG_TRACEPOINT_EVENT(flock,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd),
        TP_ARGS(sc_exit(ret,) fd, cmd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)))
 )
 #endif
 #ifndef OVERRIDE_32_mlock
 SC_LTTNG_TRACEPOINT_EVENT(mlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_munlock
 SC_LTTNG_TRACEPOINT_EVENT(munlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setreuid
 SC_LTTNG_TRACEPOINT_EVENT(setreuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid),
        TP_ARGS(sc_exit(ret,) ruid, euid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)))
 )
 #endif
 #ifndef OVERRIDE_32_setregid
 SC_LTTNG_TRACEPOINT_EVENT(setregid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid),
        TP_ARGS(sc_exit(ret,) rgid, egid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)))
 )
 #endif
 #ifndef OVERRIDE_32_tkill
 SC_LTTNG_TRACEPOINT_EVENT(tkill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_listen
 SC_LTTNG_TRACEPOINT_EVENT(listen,
        TP_PROTO(sc_exit(long ret,) int fd, int backlog),
        TP_ARGS(sc_exit(ret,) fd, backlog),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, backlog))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(backlog, backlog))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, backlog, backlog)))
 )
 #endif
 #ifndef OVERRIDE_32_shutdown
 SC_LTTNG_TRACEPOINT_EVENT(shutdown,
        TP_PROTO(sc_exit(long ret,) int fd, int how),
        TP_ARGS(sc_exit(ret,) fd, how),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, how))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(how, how))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, how, how)))
 )
 #endif
 #ifndef OVERRIDE_32_msgget
 SC_LTTNG_TRACEPOINT_EVENT(msgget,
        TP_PROTO(sc_exit(long ret,) key_t key, int msgflg),
        TP_ARGS(sc_exit(ret,) key, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(key_t, key)) sc_in(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(key, key)) sc_in(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(key_t, key, key)) sc_in(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_32_ioprio_get
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_get,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_rm_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_rm_watch,
        TP_PROTO(sc_exit(long ret,) int fd, __s32 wd),
        TP_ARGS(sc_exit(ret,) fd, wd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(__s32, wd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(wd, wd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(__s32, wd, wd)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_create
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_create,
        TP_PROTO(sc_exit(long ret,) int clockid, int flags),
        TP_ARGS(sc_exit(ret,) clockid, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, clockid)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(clockid, clockid)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, clockid, clockid)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_eventfd2
 SC_LTTNG_TRACEPOINT_EVENT(eventfd2,
        TP_PROTO(sc_exit(long ret,) unsigned int count, int flags),
        TP_ARGS(sc_exit(ret,) count, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_fanotify_init
 SC_LTTNG_TRACEPOINT_EVENT(fanotify_init,
        TP_PROTO(sc_exit(long ret,) unsigned int flags, unsigned int event_f_flags),
        TP_ARGS(sc_exit(ret,) flags, event_f_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, flags)) sc_in(__field(unsigned int, event_f_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(event_f_flags, event_f_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_in(ctf_integer(unsigned int, event_f_flags, event_f_flags)))
 )
 #endif
 #ifndef OVERRIDE_32_setns
 SC_LTTNG_TRACEPOINT_EVENT(setns,
        TP_PROTO(sc_exit(long ret,) int fd, int nstype),
        TP_ARGS(sc_exit(ret,) fd, nstype),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, nstype))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(nstype, nstype))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, nstype, nstype)))
 )
 #endif
 #ifndef OVERRIDE_32_lseek
 SC_LTTNG_TRACEPOINT_EVENT(lseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, off_t offset, unsigned int origin),
        TP_ARGS(sc_exit(ret,) fd, offset, origin),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(off_t, offset)) sc_in(__field(unsigned int, origin))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(origin, origin))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(off_t, offset, offset)) sc_in(ctf_integer(unsigned int, origin, origin)))
 )
 #endif
 #ifndef OVERRIDE_32_ioctl
 SC_LTTNG_TRACEPOINT_EVENT(ioctl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_fcntl
 SC_LTTNG_TRACEPOINT_EVENT(fcntl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_fchown16
 SC_LTTNG_TRACEPOINT_EVENT(fchown16,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, old_uid_t user, old_gid_t group),
        TP_ARGS(sc_exit(ret,) fd, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(old_uid_t, user)) sc_inout(__field(old_gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(user, user)) sc_inout(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(old_uid_t, user, user)) sc_inout(ctf_integer(old_gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_setpriority
 SC_LTTNG_TRACEPOINT_EVENT(setpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who, int niceval),
        TP_ARGS(sc_exit(ret,) which, who, niceval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, niceval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(niceval, niceval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, niceval, niceval)))
 )
 #endif
 #ifndef OVERRIDE_32_mprotect
 SC_LTTNG_TRACEPOINT_EVENT(mprotect,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned long prot),
        TP_ARGS(sc_exit(ret,) start, len, prot),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(unsigned long, prot))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(prot, prot))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned long, prot, prot)))
 )
 #endif
 #ifndef OVERRIDE_32_sysfs
 SC_LTTNG_TRACEPOINT_EVENT(sysfs,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg1, unsigned long arg2),
        TP_ARGS(sc_exit(ret,) option, arg1, arg2),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_in(__field(unsigned long, arg1)) sc_in(__field(unsigned long, arg2))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_in(tp_assign(arg1, arg1)) sc_in(tp_assign(arg2, arg2))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_in(ctf_integer(unsigned long, arg1, arg1)) sc_in(ctf_integer(unsigned long, arg2, arg2)))
 )
 #endif
 #ifndef OVERRIDE_32_msync
 SC_LTTNG_TRACEPOINT_EVENT(msync,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, int flags),
        TP_ARGS(sc_exit(ret,) start, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_setresuid16
 SC_LTTNG_TRACEPOINT_EVENT(setresuid16,
        TP_PROTO(sc_exit(long ret,) old_uid_t ruid, old_uid_t euid, old_uid_t suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_uid_t, ruid)) sc_inout(__field(old_uid_t, euid)) sc_inout(__field(old_uid_t, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ruid, ruid)) sc_inout(tp_assign(euid, euid)) sc_inout(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_uid_t, ruid, ruid)) sc_inout(ctf_integer(old_uid_t, euid, euid)) sc_inout(ctf_integer(old_uid_t, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_setresgid16
 SC_LTTNG_TRACEPOINT_EVENT(setresgid16,
        TP_PROTO(sc_exit(long ret,) old_gid_t rgid, old_gid_t egid, old_gid_t sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(old_gid_t, rgid)) sc_inout(__field(old_gid_t, egid)) sc_inout(__field(old_gid_t, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(rgid, rgid)) sc_inout(tp_assign(egid, egid)) sc_inout(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_gid_t, rgid, rgid)) sc_inout(ctf_integer(old_gid_t, egid, egid)) sc_inout(ctf_integer(old_gid_t, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_fchown
 SC_LTTNG_TRACEPOINT_EVENT(fchown,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) fd, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_setresuid
 SC_LTTNG_TRACEPOINT_EVENT(setresuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid, uid_t suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid)) sc_in(__field(uid_t, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid)) sc_in(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)) sc_in(ctf_integer(uid_t, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_setresgid
 SC_LTTNG_TRACEPOINT_EVENT(setresgid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid, gid_t sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid)) sc_in(__field(gid_t, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid)) sc_in(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)) sc_in(ctf_integer(gid_t, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_madvise
 SC_LTTNG_TRACEPOINT_EVENT(madvise,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len_in, int behavior),
        TP_ARGS(sc_exit(ret,) start, len_in, behavior),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len_in)) sc_in(__field(int, behavior))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len_in, len_in)) sc_in(tp_assign(behavior, behavior))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len_in, len_in)) sc_in(ctf_integer(int, behavior, behavior)))
 )
 #endif
 #ifndef OVERRIDE_32_fcntl64
 SC_LTTNG_TRACEPOINT_EVENT(fcntl64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_tgkill
 SC_LTTNG_TRACEPOINT_EVENT(tgkill,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_socket
 SC_LTTNG_TRACEPOINT_EVENT(socket,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol),
        TP_ARGS(sc_exit(ret,) family, type, protocol),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)))
 )
 #endif
 #ifndef OVERRIDE_32_semget
 SC_LTTNG_TRACEPOINT_EVENT(semget,
        TP_PROTO(sc_exit(long ret,) key_t key, int nsems, int semflg),
        TP_ARGS(sc_exit(ret,) key, nsems, semflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(key_t, key)) sc_in(__field(int, nsems)) sc_in(__field(int, semflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(key, key)) sc_in(tp_assign(nsems, nsems)) sc_in(tp_assign(semflg, semflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(key_t, key, key)) sc_in(ctf_integer(int, nsems, nsems)) sc_in(ctf_integer(int, semflg, semflg)))
 )
 #endif
 #ifndef OVERRIDE_32_shmget
 SC_LTTNG_TRACEPOINT_EVENT(shmget,
        TP_PROTO(sc_exit(long ret,) key_t key, size_t size, int shmflg),
        TP_ARGS(sc_exit(ret,) key, size, shmflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(key_t, key)) sc_in(__field(size_t, size)) sc_in(__field(int, shmflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(key, key)) sc_in(tp_assign(size, size)) sc_in(tp_assign(shmflg, shmflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(key_t, key, key)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, shmflg, shmflg)))
 )
 #endif
 #ifndef OVERRIDE_32_ioprio_set
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_set,
        TP_PROTO(sc_exit(long ret,) int which, int who, int ioprio),
        TP_ARGS(sc_exit(ret,) which, who, ioprio),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, ioprio))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(ioprio, ioprio))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, ioprio, ioprio)))
 )
 #endif
 #ifndef OVERRIDE_32_dup3
 SC_LTTNG_TRACEPOINT_EVENT(dup3,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd, int flags),
        TP_ARGS(sc_exit(ret,) oldfd, newfd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ptrace
 SC_LTTNG_TRACEPOINT_EVENT(ptrace,
        TP_PROTO(sc_exit(long ret,) long request, long pid, unsigned long addr, unsigned long data),
        TP_ARGS(sc_exit(ret,) request, pid, addr, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(long, request)) sc_in(__field(long, pid)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(request, request)) sc_in(tp_assign(pid, pid)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(long, request, request)) sc_in(ctf_integer(long, pid, pid)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_tee
 SC_LTTNG_TRACEPOINT_EVENT(tee,
        TP_PROTO(sc_exit(long ret,) int fdin, int fdout, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fdin, fdout, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fdin)) sc_in(__field(int, fdout)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fdin, fdin)) sc_in(tp_assign(fdout, fdout)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fdin, fdin)) sc_in(ctf_integer(int, fdout, fdout)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_mremap
 SC_LTTNG_TRACEPOINT_EVENT(mremap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr),
        TP_ARGS(sc_exit(ret,) addr, old_len, new_len, flags, new_addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(unsigned long, old_len)) sc_in(__field(unsigned long, new_len)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(unsigned long, new_addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(old_len, old_len)) sc_in(tp_assign(new_len, new_len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_addr, new_addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(unsigned long, old_len, old_len)) sc_in(ctf_integer(unsigned long, new_len, new_len)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(unsigned long, new_addr, new_addr)))
 )
 #endif
 #ifndef OVERRIDE_32_prctl
 SC_LTTNG_TRACEPOINT_EVENT(prctl,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(sc_exit(ret,) option, arg2, arg3, arg4, arg5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_inout(__field(unsigned long, arg2)) sc_in(__field(unsigned long, arg3)) sc_in(__field(unsigned long, arg4)) sc_in(__field(unsigned long, arg5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_inout(tp_assign(arg2, arg2)) sc_in(tp_assign(arg3, arg3)) sc_in(tp_assign(arg4, arg4)) sc_in(tp_assign(arg5, arg5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_inout(ctf_integer(unsigned long, arg2, arg2)) sc_in(ctf_integer(unsigned long, arg3, arg3)) sc_in(ctf_integer(unsigned long, arg4, arg4)) sc_in(ctf_integer(unsigned long, arg5, arg5)))
 )
 #endif
 #ifndef OVERRIDE_32_remap_file_pages
 SC_LTTNG_TRACEPOINT_EVENT(remap_file_pages,
        TP_PROTO(sc_exit(long ret,) unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long flags),
        TP_ARGS(sc_exit(ret,) start, size, prot, pgoff, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(unsigned long, size)) sc_in(__field(unsigned long, prot)) sc_in(__field(unsigned long, pgoff)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(size, size)) sc_in(tp_assign(prot, prot)) sc_in(tp_assign(pgoff, pgoff)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(unsigned long, size, size)) sc_in(ctf_integer(unsigned long, prot, prot)) sc_in(ctf_integer(unsigned long, pgoff, pgoff)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_keyctl
 SC_LTTNG_TRACEPOINT_EVENT(keyctl,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(sc_exit(ret,) option, arg2, arg3, arg4, arg5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_inout(__field(unsigned long, arg2)) sc_inout(__field(unsigned long, arg3)) sc_inout(__field(unsigned long, arg4)) sc_inout(__field(unsigned long, arg5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_inout(tp_assign(arg2, arg2)) sc_inout(tp_assign(arg3, arg3)) sc_inout(tp_assign(arg4, arg4)) sc_inout(tp_assign(arg5, arg5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_inout(ctf_integer(unsigned long, arg2, arg2)) sc_inout(ctf_integer(unsigned long, arg3, arg3)) sc_inout(ctf_integer(unsigned long, arg4, arg4)) sc_inout(ctf_integer(unsigned long, arg5, arg5)))
 )
 #endif
 

diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
index d5af6d0288137f9fe760f8c7cda7daa8c4cea5f7..f0e031acaff1ef89ba45059f345aa184fe613aad 100644 (file)
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
@@ -8,33 +8,23 @@
 SC_LTTNG_TRACEPOINT_EVENT(arm_fadvise64_64,
        TP_PROTO(int fd, int advice, loff_t offset, loff_t len),
        TP_ARGS(fd, advice, offset, len),
-       TP_STRUCT__entry(
-               __field_hex(int, fd)
-               __field_hex(int, advice)
-               __field_hex(loff_t, offset)
-               __field_hex(loff_t, len)),
-       TP_fast_assign(
-               tp_assign(fd, fd)
-               tp_assign(advice, advice)
-               tp_assign(offset, offset)
-               tp_assign(len, len)),
-       TP_printk()
+       TP_FIELDS(
+               ctf_integer_hex(int, fd, fd)
+               ctf_integer_hex(int, advice, advice)
+               ctf_integer_hex(loff_t, offset, offset)
+               ctf_integer_hex(loff_t, len, len)
+       )
 )
 
 SC_LTTNG_TRACEPOINT_EVENT(sync_file_range2,
        TP_PROTO(int fd, loff_t offset, loff_t nbytes, unsigned int flags),
        TP_ARGS(fd, offset, nbytes, flags),
-       TP_STRUCT__entry(
-               __field_hex(int, fd)
-               __field_hex(loff_t, offset)
-               __field_hex(loff_t, nbytes)
-               __field_hex(unsigned int, flags)),
-       TP_fast_assign(
-               tp_assign(fd, fd)
-               tp_assign(offset, offset)
-               tp_assign(nbytes, nbytes)
-               tp_assign(flags, flags)),
-       TP_printk()
+       TP_FIELDS(
+               ctf_integer_hex(int, fd, fd)
+               ctf_integer_hex(loff_t, offset, offset)
+               ctf_integer_hex(loff_t, nbytes, nbytes)
+               ctf_integer_hex(unsigned int, flags), flags)
+       )
 )
 
 #else  /* CREATE_SYSCALL_TABLE */

diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h
index 18f0703a55adea0dd56d3c4f2517171d5549ff72..049c1aa0e1269ed0b7629646060be1ab03e9f010 100644 (file)
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h
@@ -13,1719 +13,1337 @@
 SC_LTTNG_TRACEPOINT_EVENT(unlink,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_32_chdir
 SC_LTTNG_TRACEPOINT_EVENT(chdir,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_32_rmdir
 SC_LTTNG_TRACEPOINT_EVENT(rmdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_32_pipe
 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(__field_hex(int *, fildes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(fildes, fildes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(int *, fildes, fildes)))
 )
 #endif
 #ifndef OVERRIDE_32_times
 SC_LTTNG_TRACEPOINT_EVENT(times,
        TP_PROTO(sc_exit(long ret,) struct tms * tbuf),
        TP_ARGS(sc_exit(ret,) tbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct tms *, tbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tbuf, tbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct tms *, tbuf, tbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_acct
 SC_LTTNG_TRACEPOINT_EVENT(acct,
        TP_PROTO(sc_exit(long ret,) const char * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_chroot
 SC_LTTNG_TRACEPOINT_EVENT(chroot,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_32_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(sigpending,
        TP_PROTO(sc_exit(long ret,) old_sigset_t * set),
        TP_ARGS(sc_exit(ret,) set),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(old_sigset_t *, set))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(set, set))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_sigset_t *, set, set)))
 )
 #endif
 #ifndef OVERRIDE_32_uselib
 SC_LTTNG_TRACEPOINT_EVENT(uselib,
        TP_PROTO(sc_exit(long ret,) const char * library),
        TP_ARGS(sc_exit(ret,) library),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(const char *, library))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(library, library))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(const char *, library, library)))
 )
 #endif
 #ifndef OVERRIDE_32_swapoff
 SC_LTTNG_TRACEPOINT_EVENT(swapoff,
        TP_PROTO(sc_exit(long ret,) const char * specialfile),
        TP_ARGS(sc_exit(ret,) specialfile),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(specialfile, specialfile))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(specialfile, specialfile)))
 )
 #endif
 #ifndef OVERRIDE_32_sysinfo
 SC_LTTNG_TRACEPOINT_EVENT(sysinfo,
        TP_PROTO(sc_exit(long ret,) struct sysinfo * info),
        TP_ARGS(sc_exit(ret,) info),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct sysinfo *, info))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(info, info))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct sysinfo *, info, info)))
 )
 #endif
 #ifndef OVERRIDE_32_newuname
 SC_LTTNG_TRACEPOINT_EVENT(newuname,
        TP_PROTO(sc_exit(long ret,) struct new_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct new_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct new_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_adjtimex
 SC_LTTNG_TRACEPOINT_EVENT(adjtimex,
        TP_PROTO(sc_exit(long ret,) struct timex * txc_p),
        TP_ARGS(sc_exit(ret,) txc_p),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct timex *, txc_p))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(txc_p, txc_p))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct timex *, txc_p, txc_p)))
 )
 #endif
 #ifndef OVERRIDE_32_sysctl
 SC_LTTNG_TRACEPOINT_EVENT(sysctl,
        TP_PROTO(sc_exit(long ret,) struct __sysctl_args * args),
        TP_ARGS(sc_exit(ret,) args),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct __sysctl_args *, args))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(args, args))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct __sysctl_args *, args, args)))
 )
 #endif
 #ifndef OVERRIDE_32_set_tid_address
 SC_LTTNG_TRACEPOINT_EVENT(set_tid_address,
        TP_PROTO(sc_exit(long ret,) int * tidptr),
        TP_ARGS(sc_exit(ret,) tidptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(int *, tidptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tidptr, tidptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int *, tidptr, tidptr)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_unlink
 SC_LTTNG_TRACEPOINT_EVENT(mq_unlink,
        TP_PROTO(sc_exit(long ret,) const char * u_name),
        TP_ARGS(sc_exit(ret,) u_name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(u_name, u_name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(u_name, u_name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(u_name, u_name)))
 )
 #endif
 #ifndef OVERRIDE_32_shmdt
 SC_LTTNG_TRACEPOINT_EVENT(shmdt,
        TP_PROTO(sc_exit(long ret,) char * shmaddr),
        TP_ARGS(sc_exit(ret,) shmaddr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(char *, shmaddr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(shmaddr, shmaddr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(char *, shmaddr, shmaddr)))
 )
 #endif
 #ifndef OVERRIDE_32_creat
 SC_LTTNG_TRACEPOINT_EVENT(creat,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_link
 SC_LTTNG_TRACEPOINT_EVENT(link,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_chmod
 SC_LTTNG_TRACEPOINT_EVENT(chmod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_access
 SC_LTTNG_TRACEPOINT_EVENT(access,
        TP_PROTO(sc_exit(long ret,) const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_rename
 SC_LTTNG_TRACEPOINT_EVENT(rename,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_mkdir
 SC_LTTNG_TRACEPOINT_EVENT(mkdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_umount
 SC_LTTNG_TRACEPOINT_EVENT(umount,
        TP_PROTO(sc_exit(long ret,) char * name, int flags),
        TP_ARGS(sc_exit(ret,) name, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ustat
 SC_LTTNG_TRACEPOINT_EVENT(ustat,
        TP_PROTO(sc_exit(long ret,) unsigned dev, struct ustat * ubuf),
        TP_ARGS(sc_exit(ret,) dev, ubuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, dev)) sc_out(__field_hex(struct ustat *, ubuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dev, dev)) sc_out(tp_assign(ubuf, ubuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, dev, dev)) sc_out(ctf_integer(struct ustat *, ubuf, ubuf)))
 )
 #endif
 #ifndef OVERRIDE_32_sethostname
 SC_LTTNG_TRACEPOINT_EVENT(sethostname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setrlimit
 SC_LTTNG_TRACEPOINT_EVENT(setrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_getrusage
 SC_LTTNG_TRACEPOINT_EVENT(getrusage,
        TP_PROTO(sc_exit(long ret,) int who, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) who, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, who)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(who, who)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, who, who)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_gettimeofday
 SC_LTTNG_TRACEPOINT_EVENT(gettimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct timeval *, tv)) sc_out(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tv, tv)) sc_out(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct timeval *, tv, tv)) sc_out(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_32_settimeofday
 SC_LTTNG_TRACEPOINT_EVENT(settimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timeval *, tv)) sc_in(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tv, tv)) sc_in(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timeval *, tv, tv)) sc_in(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_32_getgroups16
 SC_LTTNG_TRACEPOINT_EVENT(getgroups16,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, old_gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, gidsetsize)) sc_inout(__field_hex(old_gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(gidsetsize, gidsetsize)) sc_inout(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, gidsetsize, gidsetsize)) sc_inout(ctf_integer(old_gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_setgroups16
 SC_LTTNG_TRACEPOINT_EVENT(setgroups16,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, old_gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, gidsetsize)) sc_inout(__field_hex(old_gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(gidsetsize, gidsetsize)) sc_inout(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, gidsetsize, gidsetsize)) sc_inout(ctf_integer(old_gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_symlink
 SC_LTTNG_TRACEPOINT_EVENT(symlink,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_swapon
 SC_LTTNG_TRACEPOINT_EVENT(swapon,
        TP_PROTO(sc_exit(long ret,) const char * specialfile, int swap_flags),
        TP_ARGS(sc_exit(ret,) specialfile, swap_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile)) sc_in(__field(int, swap_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(specialfile, specialfile)) sc_in(tp_assign(swap_flags, swap_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(specialfile, specialfile)) sc_in(ctf_integer(int, swap_flags, swap_flags)))
 )
 #endif
 #ifndef OVERRIDE_32_truncate
 SC_LTTNG_TRACEPOINT_EVENT(truncate,
        TP_PROTO(sc_exit(long ret,) const char * path, long length),
        TP_ARGS(sc_exit(ret,) path, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_in(__field(long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_in(ctf_integer(long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_statfs
 SC_LTTNG_TRACEPOINT_EVENT(statfs,
        TP_PROTO(sc_exit(long ret,) const char * pathname, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) pathname, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatfs
 SC_LTTNG_TRACEPOINT_EVENT(fstatfs,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) fd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_getitimer
 SC_LTTNG_TRACEPOINT_EVENT(getitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value),
        TP_ARGS(sc_exit(ret,) which, value),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_out(__field_hex(struct itimerval *, value))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_out(tp_assign(value, value))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_out(ctf_integer(struct itimerval *, value, value)))
 )
 #endif
 #ifndef OVERRIDE_32_newstat
 SC_LTTNG_TRACEPOINT_EVENT(newstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_newlstat
 SC_LTTNG_TRACEPOINT_EVENT(newlstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_newfstat
 SC_LTTNG_TRACEPOINT_EVENT(newfstat,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_setdomainname
 SC_LTTNG_TRACEPOINT_EVENT(setdomainname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_delete_module
 SC_LTTNG_TRACEPOINT_EVENT(delete_module,
        TP_PROTO(sc_exit(long ret,) const char * name_user, unsigned int flags),
        TP_ARGS(sc_exit(ret,) name_user, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name_user, name_user)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name_user, name_user)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name_user, name_user)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_setparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_getparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_rr_get_interval
 SC_LTTNG_TRACEPOINT_EVENT(sched_rr_get_interval,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct timespec * interval),
        TP_ARGS(sc_exit(ret,) pid, interval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct timespec *, interval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(interval, interval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct timespec *, interval, interval)))
 )
 #endif
 #ifndef OVERRIDE_32_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(nanosleep,
        TP_PROTO(sc_exit(long ret,) struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigpending,
        TP_PROTO(sc_exit(long ret,) sigset_t * set, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) set, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(sigset_t *, set)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(set, set)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(sigset_t *, set, set)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigsuspend
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigsuspend,
        TP_PROTO(sc_exit(long ret,) sigset_t * unewset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) unewset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(sigset_t *, unewset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unewset, unewset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(sigset_t *, unewset, unewset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_getcwd
 SC_LTTNG_TRACEPOINT_EVENT(getcwd,
        TP_PROTO(sc_exit(long ret,) char * buf, unsigned long size),
        TP_ARGS(sc_exit(ret,) buf, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(char *, buf)) sc_in(__field(unsigned long, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(unsigned long, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_getrlimit
 SC_LTTNG_TRACEPOINT_EVENT(getrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_out(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_out(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_out(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_stat64
 SC_LTTNG_TRACEPOINT_EVENT(stat64,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_lstat64
 SC_LTTNG_TRACEPOINT_EVENT(lstat64,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstat64
 SC_LTTNG_TRACEPOINT_EVENT(fstat64,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, fd)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_getgroups
 SC_LTTNG_TRACEPOINT_EVENT(getgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_out(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_out(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_out(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_setgroups
 SC_LTTNG_TRACEPOINT_EVENT(setgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_in(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_in(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_in(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_pivot_root
 SC_LTTNG_TRACEPOINT_EVENT(pivot_root,
        TP_PROTO(sc_exit(long ret,) const char * new_root, const char * put_old),
        TP_ARGS(sc_exit(ret,) new_root, put_old),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(new_root, new_root)) sc_in(__string_from_user(put_old, put_old))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(new_root, new_root)) sc_in(tp_copy_string_from_user(put_old, put_old))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(new_root, new_root)) sc_in(ctf_user_string(put_old, put_old)))
 )
 #endif
 #ifndef OVERRIDE_32_removexattr
 SC_LTTNG_TRACEPOINT_EVENT(removexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_lremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(lremovexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_fremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(fremovexattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name),
        TP_ARGS(sc_exit(ret,) fd, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_io_setup
 SC_LTTNG_TRACEPOINT_EVENT(io_setup,
        TP_PROTO(sc_exit(long ret,) unsigned nr_events, aio_context_t * ctxp),
        TP_ARGS(sc_exit(ret,) nr_events, ctxp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, nr_events)) sc_in(__field_hex(aio_context_t *, ctxp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(nr_events, nr_events)) sc_in(tp_assign(ctxp, ctxp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, nr_events, nr_events)) sc_in(ctf_integer(aio_context_t *, ctxp, ctxp)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timer_gettime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, struct itimerspec * setting),
        TP_ARGS(sc_exit(ret,) timer_id, setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_out(__field_hex(struct itimerspec *, setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_out(tp_assign(setting, setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_out(ctf_integer(struct itimerspec *, setting, setting)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_settime
 SC_LTTNG_TRACEPOINT_EVENT(clock_settime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, const struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(const struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(const struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_gettime
 SC_LTTNG_TRACEPOINT_EVENT(clock_gettime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_getres
 SC_LTTNG_TRACEPOINT_EVENT(clock_getres,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_utimes
 SC_LTTNG_TRACEPOINT_EVENT(utimes,
        TP_PROTO(sc_exit(long ret,) char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_notify
 SC_LTTNG_TRACEPOINT_EVENT(mq_notify,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const struct sigevent * u_notification),
        TP_ARGS(sc_exit(ret,) mqdes, u_notification),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const struct sigevent *, u_notification))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_in(tp_assign(u_notification, u_notification))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_in(ctf_integer(const struct sigevent *, u_notification, u_notification)))
 )
 #endif
 #ifndef OVERRIDE_32_set_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(set_robust_list,
        TP_PROTO(sc_exit(long ret,) struct robust_list_head * head, size_t len),
        TP_ARGS(sc_exit(ret,) head, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct robust_list_head *, head)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(head, head)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct robust_list_head *, head, head)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_gettime,
        TP_PROTO(sc_exit(long ret,) int ufd, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_32_pipe2
 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(__field_hex(int *, fildes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(fildes, fildes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(int *, fildes, fildes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_adjtime
 SC_LTTNG_TRACEPOINT_EVENT(clock_adjtime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timex * utx),
        TP_ARGS(sc_exit(ret,) which_clock, utx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_inout(__field_hex(struct timex *, utx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_inout(tp_assign(utx, utx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_inout(ctf_integer(struct timex *, utx, utx)))
 )
 #endif
 #ifndef OVERRIDE_32_read
 SC_LTTNG_TRACEPOINT_EVENT(read,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_write
 SC_LTTNG_TRACEPOINT_EVENT(write,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(const char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_open
 SC_LTTNG_TRACEPOINT_EVENT(open,
        TP_PROTO(sc_exit(long ret,) const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_mknod
 SC_LTTNG_TRACEPOINT_EVENT(mknod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_32_lchown16
 SC_LTTNG_TRACEPOINT_EVENT(lchown16,
        TP_PROTO(sc_exit(long ret,) const char * filename, old_uid_t user, old_gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field(old_uid_t, user)) sc_inout(__field(old_gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(user, user)) sc_inout(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(old_uid_t, user, user)) sc_inout(ctf_integer(old_gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_readlink
 SC_LTTNG_TRACEPOINT_EVENT(readlink,
        TP_PROTO(sc_exit(long ret,) const char * path, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) path, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_32_syslog
 SC_LTTNG_TRACEPOINT_EVENT(syslog,
        TP_PROTO(sc_exit(long ret,) int type, char * buf, int len),
        TP_ARGS(sc_exit(ret,) type, buf, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, type)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(type, type)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, type, type)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setitimer
 SC_LTTNG_TRACEPOINT_EVENT(setitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value, struct itimerval * ovalue),
        TP_ARGS(sc_exit(ret,) which, value, ovalue),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field_hex(struct itimerval *, value)) sc_out(__field_hex(struct itimerval *, ovalue))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(value, value)) sc_out(tp_assign(ovalue, ovalue))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(struct itimerval *, value, value)) sc_out(ctf_integer(struct itimerval *, ovalue, ovalue)))
 )
 #endif
 #ifndef OVERRIDE_32_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, old_sigset_t * nset, old_sigset_t * oset),
        TP_ARGS(sc_exit(ret,) how, nset, oset),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, how)) sc_inout(__field_hex(old_sigset_t *, nset)) sc_inout(__field_hex(old_sigset_t *, oset))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(how, how)) sc_inout(tp_assign(nset, nset)) sc_inout(tp_assign(oset, oset))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, how, how)) sc_inout(ctf_integer(old_sigset_t *, nset, nset)) sc_inout(ctf_integer(old_sigset_t *, oset, oset)))
 )
 #endif
 #ifndef OVERRIDE_32_init_module
 SC_LTTNG_TRACEPOINT_EVENT(init_module,
        TP_PROTO(sc_exit(long ret,) void * umod, unsigned long len, const char * uargs),
        TP_ARGS(sc_exit(ret,) umod, len, uargs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(void *, umod)) sc_in(__field(unsigned long, len)) sc_in(__field_hex(const char *, uargs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(umod, umod)) sc_in(tp_assign(len, len)) sc_in(tp_assign(uargs, uargs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(void *, umod, umod)) sc_in(ctf_integer(unsigned long, len, len)) sc_in(ctf_integer(const char *, uargs, uargs)))
 )
 #endif
 #ifndef OVERRIDE_32_getdents
 SC_LTTNG_TRACEPOINT_EVENT(getdents,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_readv
 SC_LTTNG_TRACEPOINT_EVENT(readv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_32_writev
 SC_LTTNG_TRACEPOINT_EVENT(writev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_setscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int policy, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, policy, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, policy)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(policy, policy)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, policy, policy)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_getresuid16
 SC_LTTNG_TRACEPOINT_EVENT(getresuid16,
        TP_PROTO(sc_exit(long ret,) old_uid_t * ruid, old_uid_t * euid, old_uid_t * suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(old_uid_t *, ruid)) sc_inout(__field_hex(old_uid_t *, euid)) sc_inout(__field_hex(old_uid_t *, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ruid, ruid)) sc_inout(tp_assign(euid, euid)) sc_inout(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_uid_t *, ruid, ruid)) sc_inout(ctf_integer(old_uid_t *, euid, euid)) sc_inout(ctf_integer(old_uid_t *, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_poll
 SC_LTTNG_TRACEPOINT_EVENT(poll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, int timeout_msecs),
        TP_ARGS(sc_exit(ret,) ufds, nfds, timeout_msecs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field(int, timeout_msecs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(timeout_msecs, timeout_msecs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(int, timeout_msecs, timeout_msecs)))
 )
 #endif
 #ifndef OVERRIDE_32_getresgid16
 SC_LTTNG_TRACEPOINT_EVENT(getresgid16,
        TP_PROTO(sc_exit(long ret,) old_gid_t * rgid, old_gid_t * egid, old_gid_t * sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(old_gid_t *, rgid)) sc_inout(__field_hex(old_gid_t *, egid)) sc_inout(__field_hex(old_gid_t *, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(rgid, rgid)) sc_inout(tp_assign(egid, egid)) sc_inout(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_gid_t *, rgid, rgid)) sc_inout(ctf_integer(old_gid_t *, egid, egid)) sc_inout(ctf_integer(old_gid_t *, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_32_chown16
 SC_LTTNG_TRACEPOINT_EVENT(chown16,
        TP_PROTO(sc_exit(long ret,) const char * filename, old_uid_t user, old_gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field(old_uid_t, user)) sc_inout(__field(old_gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(user, user)) sc_inout(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(old_uid_t, user, user)) sc_inout(ctf_integer(old_gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_lchown
 SC_LTTNG_TRACEPOINT_EVENT(lchown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_getresuid
 SC_LTTNG_TRACEPOINT_EVENT(getresuid,
        TP_PROTO(sc_exit(long ret,) uid_t * ruid, uid_t * euid, uid_t * suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(uid_t *, ruid)) sc_out(__field_hex(uid_t *, euid)) sc_out(__field_hex(uid_t *, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(ruid, ruid)) sc_out(tp_assign(euid, euid)) sc_out(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(uid_t *, ruid, ruid)) sc_out(ctf_integer(uid_t *, euid, euid)) sc_out(ctf_integer(uid_t *, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_getresgid
 SC_LTTNG_TRACEPOINT_EVENT(getresgid,
        TP_PROTO(sc_exit(long ret,) gid_t * rgid, gid_t * egid, gid_t * sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(gid_t *, rgid)) sc_out(__field_hex(gid_t *, egid)) sc_out(__field_hex(gid_t *, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(rgid, rgid)) sc_out(tp_assign(egid, egid)) sc_out(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(gid_t *, rgid, rgid)) sc_out(ctf_integer(gid_t *, egid, egid)) sc_out(ctf_integer(gid_t *, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_chown
 SC_LTTNG_TRACEPOINT_EVENT(chown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_getdents64
 SC_LTTNG_TRACEPOINT_EVENT(getdents64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent64 * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent64 *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent64 *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_mincore
 SC_LTTNG_TRACEPOINT_EVENT(mincore,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned char * vec),
        TP_ARGS(sc_exit(ret,) start, len, vec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_out(__field_hex(unsigned char *, vec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_out(tp_assign(vec, vec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_out(ctf_integer(unsigned char *, vec, vec)))
 )
 #endif
 #ifndef OVERRIDE_32_listxattr
 SC_LTTNG_TRACEPOINT_EVENT(listxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_llistxattr
 SC_LTTNG_TRACEPOINT_EVENT(llistxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_flistxattr
 SC_LTTNG_TRACEPOINT_EVENT(flistxattr,
        TP_PROTO(sc_exit(long ret,) int fd, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) fd, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setaffinity
 SC_LTTNG_TRACEPOINT_EVENT(sched_setaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_in(__field_hex(unsigned long *, user_mask_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(len, len)) sc_in(tp_assign(user_mask_ptr, user_mask_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, len, len)) sc_in(ctf_integer(unsigned long *, user_mask_ptr, user_mask_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getaffinity
 SC_LTTNG_TRACEPOINT_EVENT(sched_getaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_out(__field_hex(unsigned long *, user_mask_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(len, len)) sc_out(tp_assign(user_mask_ptr, user_mask_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, len, len)) sc_out(ctf_integer(unsigned long *, user_mask_ptr, user_mask_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_io_submit
 SC_LTTNG_TRACEPOINT_EVENT(io_submit,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long nr, struct iocb * * iocbpp),
        TP_ARGS(sc_exit(ret,) ctx_id, nr, iocbpp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, nr)) sc_in(__field_hex(struct iocb * *, iocbpp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(nr, nr)) sc_in(tp_assign(iocbpp, iocbpp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, nr, nr)) sc_in(ctf_integer(struct iocb * *, iocbpp, iocbpp)))
 )
 #endif
 #ifndef OVERRIDE_32_io_cancel
 SC_LTTNG_TRACEPOINT_EVENT(io_cancel,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, struct iocb * iocb, struct io_event * result),
        TP_ARGS(sc_exit(ret,) ctx_id, iocb, result),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field_hex(struct iocb *, iocb)) sc_out(__field_hex(struct io_event *, result))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(iocb, iocb)) sc_out(tp_assign(result, result))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(struct iocb *, iocb, iocb)) sc_out(ctf_integer(struct io_event *, result, result)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_create
 SC_LTTNG_TRACEPOINT_EVENT(timer_create,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct sigevent * timer_event_spec, timer_t * created_timer_id),
        TP_ARGS(sc_exit(ret,) which_clock, timer_event_spec, created_timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(struct sigevent *, timer_event_spec)) sc_out(__field_hex(timer_t *, created_timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(timer_event_spec, timer_event_spec)) sc_out(tp_assign(created_timer_id, created_timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(struct sigevent *, timer_event_spec, timer_event_spec)) sc_out(ctf_integer(timer_t *, created_timer_id, created_timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_getsetattr
 SC_LTTNG_TRACEPOINT_EVENT(mq_getsetattr,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const struct mq_attr * u_mqstat, struct mq_attr * u_omqstat),
        TP_ARGS(sc_exit(ret,) mqdes, u_mqstat, u_omqstat),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const struct mq_attr *, u_mqstat)) sc_out(__field_hex(struct mq_attr *, u_omqstat))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_in(tp_assign(u_mqstat, u_mqstat)) sc_out(tp_assign(u_omqstat, u_omqstat))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_in(ctf_integer(const struct mq_attr *, u_mqstat, u_mqstat)) sc_out(ctf_integer(struct mq_attr *, u_omqstat, u_omqstat)))
 )
 #endif
 #ifndef OVERRIDE_32_bind
 SC_LTTNG_TRACEPOINT_EVENT(bind,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * umyaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, umyaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, umyaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(umyaddr, umyaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, umyaddr, umyaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_connect
 SC_LTTNG_TRACEPOINT_EVENT(connect,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, uservaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(uservaddr, uservaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, uservaddr, uservaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_accept
 SC_LTTNG_TRACEPOINT_EVENT(accept,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_getsockname
 SC_LTTNG_TRACEPOINT_EVENT(getsockname,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_getpeername
 SC_LTTNG_TRACEPOINT_EVENT(getpeername,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_sendmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_recvmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_inout(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_semop
 SC_LTTNG_TRACEPOINT_EVENT(semop,
        TP_PROTO(sc_exit(long ret,) int semid, struct sembuf * tsops, unsigned nsops),
        TP_ARGS(sc_exit(ret,) semid, tsops, nsops),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, semid)) sc_in(__field_hex(struct sembuf *, tsops)) sc_in(__field(unsigned, nsops))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(semid, semid)) sc_in(tp_assign(tsops, tsops)) sc_in(tp_assign(nsops, nsops))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, semid, semid)) sc_in(ctf_integer(struct sembuf *, tsops, tsops)) sc_in(ctf_integer(unsigned, nsops, nsops)))
 )
 #endif
 #ifndef OVERRIDE_32_msgctl
 SC_LTTNG_TRACEPOINT_EVENT(msgctl,
        TP_PROTO(sc_exit(long ret,) int msqid, int cmd, struct msqid_ds * buf),
        TP_ARGS(sc_exit(ret,) msqid, cmd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_in(__field(int, cmd)) sc_inout(__field_hex(struct msqid_ds *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(msqid, msqid)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, msqid, msqid)) sc_in(ctf_integer(int, cmd, cmd)) sc_inout(ctf_integer(struct msqid_ds *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_shmat
 SC_LTTNG_TRACEPOINT_EVENT(shmat,
        TP_PROTO(sc_exit(long ret,) int shmid, char * shmaddr, int shmflg),
        TP_ARGS(sc_exit(ret,) shmid, shmaddr, shmflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, shmid)) sc_in(__field_hex(char *, shmaddr)) sc_in(__field(int, shmflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(shmid, shmid)) sc_in(tp_assign(shmaddr, shmaddr)) sc_in(tp_assign(shmflg, shmflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, shmid, shmid)) sc_in(ctf_integer(char *, shmaddr, shmaddr)) sc_in(ctf_integer(int, shmflg, shmflg)))
 )
 #endif
 #ifndef OVERRIDE_32_shmctl
 SC_LTTNG_TRACEPOINT_EVENT(shmctl,
        TP_PROTO(sc_exit(long ret,) int shmid, int cmd, struct shmid_ds * buf),
        TP_ARGS(sc_exit(ret,) shmid, cmd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, shmid)) sc_in(__field(int, cmd)) sc_inout(__field_hex(struct shmid_ds *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(shmid, shmid)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, shmid, shmid)) sc_in(ctf_integer(int, cmd, cmd)) sc_inout(ctf_integer(struct shmid_ds *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_add_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_add_watch,
        TP_PROTO(sc_exit(long ret,) int fd, const char * pathname, u32 mask),
        TP_ARGS(sc_exit(ret,) fd, pathname, mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(u32, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(u32, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_32_mkdirat
 SC_LTTNG_TRACEPOINT_EVENT(mkdirat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_futimesat
 SC_LTTNG_TRACEPOINT_EVENT(futimesat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_32_unlinkat
 SC_LTTNG_TRACEPOINT_EVENT(unlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, int flag),
        TP_ARGS(sc_exit(ret,) dfd, pathname, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_symlinkat
 SC_LTTNG_TRACEPOINT_EVENT(symlinkat,
        TP_PROTO(sc_exit(long ret,) const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_fchmodat
 SC_LTTNG_TRACEPOINT_EVENT(fchmodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_faccessat
 SC_LTTNG_TRACEPOINT_EVENT(faccessat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_get_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(get_robust_list,
        TP_PROTO(sc_exit(long ret,) int pid, struct robust_list_head * * head_ptr, size_t * len_ptr),
        TP_ARGS(sc_exit(ret,) pid, head_ptr, len_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, pid)) sc_out(__field_hex(struct robust_list_head * *, head_ptr)) sc_out(__field_hex(size_t *, len_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(head_ptr, head_ptr)) sc_out(tp_assign(len_ptr, len_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, pid, pid)) sc_out(ctf_integer(struct robust_list_head * *, head_ptr, head_ptr)) sc_out(ctf_integer(size_t *, len_ptr, len_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_getcpu
 SC_LTTNG_TRACEPOINT_EVENT(getcpu,
        TP_PROTO(sc_exit(long ret,) unsigned * cpup, unsigned * nodep, struct getcpu_cache * unused),
        TP_ARGS(sc_exit(ret,) cpup, nodep, unused),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(unsigned *, cpup)) sc_out(__field_hex(unsigned *, nodep)) sc_inout(__field_hex(struct getcpu_cache *, unused))),
-       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(unused, unused))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(unsigned *, cpup, cpup)) sc_out(ctf_integer(unsigned *, nodep, nodep)) sc_inout(ctf_integer(struct getcpu_cache *, unused, unused)))
 )
 #endif
 #ifndef OVERRIDE_32_signalfd
 SC_LTTNG_TRACEPOINT_EVENT(signalfd,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)))
 )
 #endif
 #ifndef OVERRIDE_32_open_by_handle_at
 SC_LTTNG_TRACEPOINT_EVENT(open_by_handle_at,
        TP_PROTO(sc_exit(long ret,) int mountdirfd, struct file_handle * handle, int flags),
        TP_ARGS(sc_exit(ret,) mountdirfd, handle, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mountdirfd)) sc_in(__field_hex(struct file_handle *, handle)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mountdirfd, mountdirfd)) sc_in(tp_assign(handle, handle)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, mountdirfd, mountdirfd)) sc_in(ctf_integer(struct file_handle *, handle, handle)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_reboot
 SC_LTTNG_TRACEPOINT_EVENT(reboot,
        TP_PROTO(sc_exit(long ret,) int magic1, int magic2, unsigned int cmd, void * arg),
        TP_ARGS(sc_exit(ret,) magic1, magic2, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, magic1)) sc_in(__field(int, magic2)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(void *, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(magic1, magic1)) sc_in(tp_assign(magic2, magic2)) sc_in(tp_assign(cmd, cmd)) sc_in(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, magic1, magic1)) sc_in(ctf_integer(int, magic2, magic2)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_in(ctf_integer(void *, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_wait4
 SC_LTTNG_TRACEPOINT_EVENT(wait4,
        TP_PROTO(sc_exit(long ret,) pid_t upid, int * stat_addr, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) upid, stat_addr, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(int *, stat_addr)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(stat_addr, stat_addr)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(int *, stat_addr, stat_addr)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_quotactl
 SC_LTTNG_TRACEPOINT_EVENT(quotactl,
        TP_PROTO(sc_exit(long ret,) unsigned int cmd, const char * special, qid_t id, void * addr),
        TP_ARGS(sc_exit(ret,) cmd, special, id, addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(const char *, special)) sc_in(__field(qid_t, id)) sc_inout(__field_hex(void *, addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(cmd, cmd)) sc_in(tp_assign(special, special)) sc_in(tp_assign(id, id)) sc_inout(tp_assign(addr, addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_in(ctf_integer(const char *, special, special)) sc_in(ctf_integer(qid_t, id, id)) sc_inout(ctf_integer(void *, addr, addr)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction * act, struct sigaction * oact, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) sig, act, oact, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, sig)) sc_in(__field_hex(const struct sigaction *, act)) sc_out(__field_hex(struct sigaction *, oact)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(act, act)) sc_out(tp_assign(oact, oact)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(const struct sigaction *, act, act)) sc_out(ctf_integer(struct sigaction *, oact, oact)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, sigset_t * nset, sigset_t * oset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) how, nset, oset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, how)) sc_in(__field_hex(sigset_t *, nset)) sc_out(__field_hex(sigset_t *, oset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(how, how)) sc_in(tp_assign(nset, nset)) sc_out(tp_assign(oset, oset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, how, how)) sc_in(ctf_integer(sigset_t *, nset, nset)) sc_out(ctf_integer(sigset_t *, oset, oset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigtimedwait
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigtimedwait,
        TP_PROTO(sc_exit(long ret,) const sigset_t * uthese, siginfo_t * uinfo, const struct timespec * uts, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uthese, uinfo, uts, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(const sigset_t *, uthese)) sc_out(__field_hex(siginfo_t *, uinfo)) sc_in(__field_hex(const struct timespec *, uts)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(uthese, uthese)) sc_out(tp_assign(uinfo, uinfo)) sc_in(tp_assign(uts, uts)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(const sigset_t *, uthese, uthese)) sc_out(ctf_integer(siginfo_t *, uinfo, uinfo)) sc_in(ctf_integer(const struct timespec *, uts, uts)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_sendfile
 SC_LTTNG_TRACEPOINT_EVENT(sendfile,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, off_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, out_fd)) sc_inout(__field(int, in_fd)) sc_inout(__field_hex(off_t *, offset)) sc_inout(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(out_fd, out_fd)) sc_inout(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_inout(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, out_fd, out_fd)) sc_inout(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(off_t *, offset, offset)) sc_inout(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_getxattr
 SC_LTTNG_TRACEPOINT_EVENT(getxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_lgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lgetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_fgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fgetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) fd, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_sendfile64
 SC_LTTNG_TRACEPOINT_EVENT(sendfile64,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, loff_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, out_fd)) sc_in(__field(int, in_fd)) sc_inout(__field_hex(loff_t *, offset)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(out_fd, out_fd)) sc_in(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, out_fd, out_fd)) sc_in(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(loff_t *, offset, offset)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_ctl
 SC_LTTNG_TRACEPOINT_EVENT(epoll_ctl,
        TP_PROTO(sc_exit(long ret,) int epfd, int op, int fd, struct epoll_event * event),
        TP_ARGS(sc_exit(ret,) epfd, op, fd, event),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_in(__field(int, op)) sc_in(__field(int, fd)) sc_in(__field_hex(struct epoll_event *, event))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_in(tp_assign(op, op)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(event, event))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct epoll_event *, event, event)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_wait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_wait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_settime
 SC_LTTNG_TRACEPOINT_EVENT(timer_settime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, int flags, const struct itimerspec * new_setting, struct itimerspec * old_setting),
        TP_ARGS(sc_exit(ret,) timer_id, flags, new_setting, old_setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, new_setting)) sc_out(__field_hex(struct itimerspec *, old_setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_setting, new_setting)) sc_out(tp_assign(old_setting, old_setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, new_setting, new_setting)) sc_out(ctf_integer(struct itimerspec *, old_setting, old_setting)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(clock_nanosleep,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, int flags, const struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) which_clock, flags, rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_open
 SC_LTTNG_TRACEPOINT_EVENT(mq_open,
        TP_PROTO(sc_exit(long ret,) const char * u_name, int oflag, umode_t mode, struct mq_attr * u_attr),
        TP_ARGS(sc_exit(ret,) u_name, oflag, mode, u_attr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(u_name, u_name)) sc_in(__field(int, oflag)) sc_in(__field(umode_t, mode)) sc_in(__field_hex(struct mq_attr *, u_attr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(u_name, u_name)) sc_in(tp_assign(oflag, oflag)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(u_attr, u_attr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(u_name, u_name)) sc_in(ctf_integer(int, oflag, oflag)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(struct mq_attr *, u_attr, u_attr)))
 )
 #endif
 #ifndef OVERRIDE_32_socketpair
 SC_LTTNG_TRACEPOINT_EVENT(socketpair,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol, int * usockvec),
        TP_ARGS(sc_exit(ret,) family, type, protocol, usockvec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol)) sc_out(__field_hex(int *, usockvec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol)) sc_out(tp_assign(usockvec, usockvec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)) sc_out(ctf_integer(int *, usockvec, usockvec)))
 )
 #endif
 #ifndef OVERRIDE_32_send
 SC_LTTNG_TRACEPOINT_EVENT(send,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned flags),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, fd)) sc_inout(__field_hex(void *, buff)) sc_inout(__field(size_t, len)) sc_inout(__field(unsigned, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(buff, buff)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(void *, buff, buff)) sc_inout(ctf_integer(size_t, len, len)) sc_inout(ctf_integer(unsigned, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_msgsnd
 SC_LTTNG_TRACEPOINT_EVENT(msgsnd,
        TP_PROTO(sc_exit(long ret,) int msqid, struct msgbuf * msgp, size_t msgsz, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_in(__field_hex(struct msgbuf *, msgp)) sc_in(__field(size_t, msgsz)) sc_in(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(msqid, msqid)) sc_in(tp_assign(msgp, msgp)) sc_in(tp_assign(msgsz, msgsz)) sc_in(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, msqid, msqid)) sc_in(ctf_integer(struct msgbuf *, msgp, msgp)) sc_in(ctf_integer(size_t, msgsz, msgsz)) sc_in(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_32_request_key
 SC_LTTNG_TRACEPOINT_EVENT(request_key,
        TP_PROTO(sc_exit(long ret,) const char * _type, const char * _description, const char * _callout_info, key_serial_t destringid),
        TP_ARGS(sc_exit(ret,) _type, _description, _callout_info, destringid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(_type, _type)) sc_in(__field_hex(const char *, _description)) sc_in(__field_hex(const char *, _callout_info)) sc_in(__field(key_serial_t, destringid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(_type, _type)) sc_in(tp_assign(_description, _description)) sc_in(tp_assign(_callout_info, _callout_info)) sc_in(tp_assign(destringid, destringid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(_type, _type)) sc_in(ctf_integer(const char *, _description, _description)) sc_in(ctf_integer(const char *, _callout_info, _callout_info)) sc_in(ctf_integer(key_serial_t, destringid, destringid)))
 )
 #endif
 #ifndef OVERRIDE_32_semtimedop
 SC_LTTNG_TRACEPOINT_EVENT(semtimedop,
        TP_PROTO(sc_exit(long ret,) int semid, struct sembuf * tsops, unsigned nsops, const struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) semid, tsops, nsops, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, semid)) sc_in(__field_hex(struct sembuf *, tsops)) sc_in(__field(unsigned, nsops)) sc_inout(__field_hex(const struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(semid, semid)) sc_in(tp_assign(tsops, tsops)) sc_in(tp_assign(nsops, nsops)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, semid, semid)) sc_in(ctf_integer(struct sembuf *, tsops, tsops)) sc_in(ctf_integer(unsigned, nsops, nsops)) sc_inout(ctf_integer(const struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_openat
 SC_LTTNG_TRACEPOINT_EVENT(openat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_mknodat
 SC_LTTNG_TRACEPOINT_EVENT(mknodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatat64
 SC_LTTNG_TRACEPOINT_EVENT(fstatat64,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct stat64 * statbuf, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, statbuf, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, dfd)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf)) sc_inout(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(dfd, dfd)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf)) sc_inout(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, dfd, dfd)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)) sc_inout(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_renameat
 SC_LTTNG_TRACEPOINT_EVENT(renameat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_readlinkat
 SC_LTTNG_TRACEPOINT_EVENT(readlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) dfd, pathname, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_32_vmsplice
 SC_LTTNG_TRACEPOINT_EVENT(vmsplice,
        TP_PROTO(sc_exit(long ret,) int fd, const struct iovec * iov, unsigned long nr_segs, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, iov, nr_segs, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(const struct iovec *, iov)) sc_in(__field(unsigned long, nr_segs)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(iov, iov)) sc_in(tp_assign(nr_segs, nr_segs)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(const struct iovec *, iov, iov)) sc_in(ctf_integer(unsigned long, nr_segs, nr_segs)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_utimensat
 SC_LTTNG_TRACEPOINT_EVENT(utimensat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timespec * utimes, int flags),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timespec *, utimes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timespec *, utimes, utimes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_settime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_settime,
        TP_PROTO(sc_exit(long ret,) int ufd, int flags, const struct itimerspec * utmr, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, flags, utmr, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, utmr)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(utmr, utmr)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, utmr, utmr)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_32_signalfd4
 SC_LTTNG_TRACEPOINT_EVENT(signalfd4,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask, int flags),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_tgsigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_tgsigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_32_accept4
 SC_LTTNG_TRACEPOINT_EVENT(accept4,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen, int flags),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_prlimit64
 SC_LTTNG_TRACEPOINT_EVENT(prlimit64,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int resource, const struct rlimit64 * new_rlim, struct rlimit64 * old_rlim),
        TP_ARGS(sc_exit(ret,) pid, resource, new_rlim, old_rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(const struct rlimit64 *, new_rlim)) sc_out(__field_hex(struct rlimit64 *, old_rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(new_rlim, new_rlim)) sc_out(tp_assign(old_rlim, old_rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(const struct rlimit64 *, new_rlim, new_rlim)) sc_out(ctf_integer(struct rlimit64 *, old_rlim, old_rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_sendmmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_mount
 SC_LTTNG_TRACEPOINT_EVENT(mount,
        TP_PROTO(sc_exit(long ret,) char * dev_name, char * dir_name, char * type, unsigned long flags, void * data),
        TP_ARGS(sc_exit(ret,) dev_name, dir_name, type, flags, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(dev_name, dev_name)) sc_in(__string_from_user(dir_name, dir_name)) sc_in(__string_from_user(type, type)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(void *, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(dev_name, dev_name)) sc_in(tp_copy_string_from_user(dir_name, dir_name)) sc_in(tp_copy_string_from_user(type, type)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(dev_name, dev_name)) sc_in(ctf_user_string(dir_name, dir_name)) sc_in(ctf_user_string(type, type)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(void *, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_llseek
 SC_LTTNG_TRACEPOINT_EVENT(llseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t * result, unsigned int origin),
        TP_ARGS(sc_exit(ret,) fd, offset_high, offset_low, result, origin),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned long, offset_high)) sc_inout(__field(unsigned long, offset_low)) sc_inout(__field_hex(loff_t *, result)) sc_inout(__field(unsigned int, origin))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset_high, offset_high)) sc_inout(tp_assign(offset_low, offset_low)) sc_inout(tp_assign(result, result)) sc_inout(tp_assign(origin, origin))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned long, offset_high, offset_high)) sc_inout(ctf_integer(unsigned long, offset_low, offset_low)) sc_inout(ctf_integer(loff_t *, result, result)) sc_inout(ctf_integer(unsigned int, origin, origin)))
 )
 #endif
 #ifndef OVERRIDE_32_select
 SC_LTTNG_TRACEPOINT_EVENT(select,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timeval * tvp),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tvp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timeval *, tvp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tvp, tvp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timeval *, tvp, tvp)))
 )
 #endif
 #ifndef OVERRIDE_32_setxattr
 SC_LTTNG_TRACEPOINT_EVENT(setxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_lsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lsetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_fsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fsetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) fd, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_io_getevents
 SC_LTTNG_TRACEPOINT_EVENT(io_getevents,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long min_nr, long nr, struct io_event * events, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) ctx_id, min_nr, nr, events, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, min_nr)) sc_in(__field(long, nr)) sc_out(__field_hex(struct io_event *, events)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(min_nr, min_nr)) sc_in(tp_assign(nr, nr)) sc_out(tp_assign(events, events)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, min_nr, min_nr)) sc_in(ctf_integer(long, nr, nr)) sc_out(ctf_integer(struct io_event *, events, events)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_timedsend
 SC_LTTNG_TRACEPOINT_EVENT(mq_timedsend,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const char * u_msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec * u_abs_timeout),
        TP_ARGS(sc_exit(ret,) mqdes, u_msg_ptr, msg_len, msg_prio, u_abs_timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const char *, u_msg_ptr)) sc_in(__field(size_t, msg_len)) sc_in(__field(unsigned int, msg_prio)) sc_in(__field_hex(const struct timespec *, u_abs_timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_in(tp_assign(u_msg_ptr, u_msg_ptr)) sc_in(tp_assign(msg_len, msg_len)) sc_in(tp_assign(msg_prio, msg_prio)) sc_in(tp_assign(u_abs_timeout, u_abs_timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_in(ctf_integer(const char *, u_msg_ptr, u_msg_ptr)) sc_in(ctf_integer(size_t, msg_len, msg_len)) sc_in(ctf_integer(unsigned int, msg_prio, msg_prio)) sc_in(ctf_integer(const struct timespec *, u_abs_timeout, u_abs_timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_timedreceive
 SC_LTTNG_TRACEPOINT_EVENT(mq_timedreceive,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, char * u_msg_ptr, size_t msg_len, unsigned int * u_msg_prio, const struct timespec * u_abs_timeout),
        TP_ARGS(sc_exit(ret,) mqdes, u_msg_ptr, msg_len, u_msg_prio, u_abs_timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_out(__field_hex(char *, u_msg_ptr)) sc_in(__field(size_t, msg_len)) sc_out(__field_hex(unsigned int *, u_msg_prio)) sc_in(__field_hex(const struct timespec *, u_abs_timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_out(tp_assign(u_msg_ptr, u_msg_ptr)) sc_in(tp_assign(msg_len, msg_len)) sc_out(tp_assign(u_msg_prio, u_msg_prio)) sc_in(tp_assign(u_abs_timeout, u_abs_timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_out(ctf_integer(char *, u_msg_ptr, u_msg_ptr)) sc_in(ctf_integer(size_t, msg_len, msg_len)) sc_out(ctf_integer(unsigned int *, u_msg_prio, u_msg_prio)) sc_in(ctf_integer(const struct timespec *, u_abs_timeout, u_abs_timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_waitid
 SC_LTTNG_TRACEPOINT_EVENT(waitid,
        TP_PROTO(sc_exit(long ret,) int which, pid_t upid, struct siginfo * infop, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) which, upid, infop, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(struct siginfo *, infop)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(infop, infop)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(struct siginfo *, infop, infop)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_setsockopt
 SC_LTTNG_TRACEPOINT_EVENT(setsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_in(__field_hex(char *, optval)) sc_in(__field(int, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_in(tp_assign(optval, optval)) sc_in(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_in(ctf_integer(char *, optval, optval)) sc_in(ctf_integer(int, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_32_getsockopt
 SC_LTTNG_TRACEPOINT_EVENT(getsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int * optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_out(__field_hex(char *, optval)) sc_inout(__field_hex(int *, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_out(tp_assign(optval, optval)) sc_inout(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_out(ctf_integer(char *, optval, optval)) sc_inout(ctf_integer(int *, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_32_msgrcv
 SC_LTTNG_TRACEPOINT_EVENT(msgrcv,
        TP_PROTO(sc_exit(long ret,) int msqid, struct msgbuf * msgp, size_t msgsz, long msgtyp, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgtyp, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_out(__field_hex(struct msgbuf *, msgp)) sc_in(__field(size_t, msgsz)) sc_in(__field(long, msgtyp)) sc_in(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(msqid, msqid)) sc_out(tp_assign(msgp, msgp)) sc_in(tp_assign(msgsz, msgsz)) sc_in(tp_assign(msgtyp, msgtyp)) sc_in(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, msqid, msqid)) sc_out(ctf_integer(struct msgbuf *, msgp, msgp)) sc_in(ctf_integer(size_t, msgsz, msgsz)) sc_in(ctf_integer(long, msgtyp, msgtyp)) sc_in(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_32_add_key
 SC_LTTNG_TRACEPOINT_EVENT(add_key,
        TP_PROTO(sc_exit(long ret,) const char * _type, const char * _description, const void * _payload, size_t plen, key_serial_t ringid),
        TP_ARGS(sc_exit(ret,) _type, _description, _payload, plen, ringid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(_type, _type)) sc_in(__field_hex(const char *, _description)) sc_in(__field_hex(const void *, _payload)) sc_in(__field(size_t, plen)) sc_in(__field(key_serial_t, ringid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(_type, _type)) sc_in(tp_assign(_description, _description)) sc_in(tp_assign(_payload, _payload)) sc_in(tp_assign(plen, plen)) sc_in(tp_assign(ringid, ringid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(_type, _type)) sc_in(ctf_integer(const char *, _description, _description)) sc_in(ctf_integer(const void *, _payload, _payload)) sc_in(ctf_integer(size_t, plen, plen)) sc_in(ctf_integer(key_serial_t, ringid, ringid)))
 )
 #endif
 #ifndef OVERRIDE_32_fchownat
 SC_LTTNG_TRACEPOINT_EVENT(fchownat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, uid_t user, gid_t group, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, user, group, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_linkat
 SC_LTTNG_TRACEPOINT_EVENT(linkat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname, int flags),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ppoll
 SC_LTTNG_TRACEPOINT_EVENT(ppoll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, struct timespec * tsp, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) ufds, nfds, tsp, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(tsp, tsp)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_preadv
 SC_LTTNG_TRACEPOINT_EVENT(preadv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_out(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_out(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_32_pwritev
 SC_LTTNG_TRACEPOINT_EVENT(pwritev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_in(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_in(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_32_perf_event_open
 SC_LTTNG_TRACEPOINT_EVENT(perf_event_open,
        TP_PROTO(sc_exit(long ret,) struct perf_event_attr * attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags),
        TP_ARGS(sc_exit(ret,) attr_uptr, pid, cpu, group_fd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct perf_event_attr *, attr_uptr)) sc_in(__field(pid_t, pid)) sc_in(__field(int, cpu)) sc_in(__field(int, group_fd)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(attr_uptr, attr_uptr)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(cpu, cpu)) sc_in(tp_assign(group_fd, group_fd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct perf_event_attr *, attr_uptr, attr_uptr)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, cpu, cpu)) sc_in(ctf_integer(int, group_fd, group_fd)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_recvmmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_name_to_handle_at
 SC_LTTNG_TRACEPOINT_EVENT(name_to_handle_at,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * name, struct file_handle * handle, int * mnt_id, int flag),
        TP_ARGS(sc_exit(ret,) dfd, name, handle, mnt_id, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(name, name)) sc_inout(__field_hex(struct file_handle *, handle)) sc_out(__field_hex(int *, mnt_id)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(name, name)) sc_inout(tp_assign(handle, handle)) sc_out(tp_assign(mnt_id, mnt_id)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(name, name)) sc_inout(ctf_integer(struct file_handle *, handle, handle)) sc_out(ctf_integer(int *, mnt_id, mnt_id)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_futex
 SC_LTTNG_TRACEPOINT_EVENT(futex,
        TP_PROTO(sc_exit(long ret,) u32 * uaddr, int op, u32 val, struct timespec * utime, u32 * uaddr2, u32 val3),
        TP_ARGS(sc_exit(ret,) uaddr, op, val, utime, uaddr2, val3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(u32 *, uaddr)) sc_in(__field(int, op)) sc_in(__field(u32, val)) sc_in(__field_hex(struct timespec *, utime)) sc_inout(__field_hex(u32 *, uaddr2)) sc_in(__field(u32, val3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uaddr, uaddr)) sc_in(tp_assign(op, op)) sc_in(tp_assign(val, val)) sc_in(tp_assign(utime, utime)) sc_inout(tp_assign(uaddr2, uaddr2)) sc_in(tp_assign(val3, val3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(u32 *, uaddr, uaddr)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(u32, val, val)) sc_in(ctf_integer(struct timespec *, utime, utime)) sc_inout(ctf_integer(u32 *, uaddr2, uaddr2)) sc_in(ctf_integer(u32, val3, val3)))
 )
 #endif
 #ifndef OVERRIDE_32_sendto
 SC_LTTNG_TRACEPOINT_EVENT(sendto,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned flags, struct sockaddr * addr, int addr_len),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(void *, buff)) sc_in(__field(size_t, len)) sc_in(__field(unsigned, flags)) sc_in(__field_hex(struct sockaddr *, addr)) sc_in(__field_hex(int, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buff, buff)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(void *, buff, buff)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned, flags, flags)) sc_in(ctf_integer(struct sockaddr *, addr, addr)) sc_in(ctf_integer(int, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_recvfrom
 SC_LTTNG_TRACEPOINT_EVENT(recvfrom,
        TP_PROTO(sc_exit(long ret,) int fd, void * ubuf, size_t size, unsigned flags, struct sockaddr * addr, int * addr_len),
        TP_ARGS(sc_exit(ret,) fd, ubuf, size, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(void *, ubuf)) sc_in(__field(size_t, size)) sc_in(__field(unsigned, flags)) sc_out(__field_hex(struct sockaddr *, addr)) sc_inout(__field_hex(int *, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(ubuf, ubuf)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags)) sc_out(tp_assign(addr, addr)) sc_inout(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(void *, ubuf, ubuf)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(unsigned, flags, flags)) sc_out(ctf_integer(struct sockaddr *, addr, addr)) sc_inout(ctf_integer(int *, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_pselect6
 SC_LTTNG_TRACEPOINT_EVENT(pselect6,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timespec * tsp, void * sig),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tsp, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(void *, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tsp, tsp)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(void *, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_splice
 SC_LTTNG_TRACEPOINT_EVENT(splice,
        TP_PROTO(sc_exit(long ret,) int fd_in, loff_t * off_in, int fd_out, loff_t * off_out, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd_in, off_in, fd_out, off_out, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd_in)) sc_in(__field_hex(loff_t *, off_in)) sc_in(__field(int, fd_out)) sc_in(__field_hex(loff_t *, off_out)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd_in, fd_in)) sc_in(tp_assign(off_in, off_in)) sc_in(tp_assign(fd_out, fd_out)) sc_in(tp_assign(off_out, off_out)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd_in, fd_in)) sc_in(ctf_integer(loff_t *, off_in, off_in)) sc_in(ctf_integer(int, fd_out, fd_out)) sc_in(ctf_integer(loff_t *, off_out, off_out)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_pwait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_process_vm_readv
 SC_LTTNG_TRACEPOINT_EVENT(process_vm_readv,
        TP_PROTO(sc_exit(long ret,) pid_t pid, const struct iovec * lvec, unsigned long liovcnt, const struct iovec * rvec, unsigned long riovcnt, unsigned long flags),
        TP_ARGS(sc_exit(ret,) pid, lvec, liovcnt, rvec, riovcnt, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(const struct iovec *, lvec)) sc_in(__field(unsigned long, liovcnt)) sc_in(__field_hex(const struct iovec *, rvec)) sc_in(__field(unsigned long, riovcnt)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(lvec, lvec)) sc_in(tp_assign(liovcnt, liovcnt)) sc_in(tp_assign(rvec, rvec)) sc_in(tp_assign(riovcnt, riovcnt)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(const struct iovec *, lvec, lvec)) sc_in(ctf_integer(unsigned long, liovcnt, liovcnt)) sc_in(ctf_integer(const struct iovec *, rvec, rvec)) sc_in(ctf_integer(unsigned long, riovcnt, riovcnt)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_process_vm_writev
 SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev,
        TP_PROTO(sc_exit(long ret,) pid_t pid, const struct iovec * lvec, unsigned long liovcnt, const struct iovec * rvec, unsigned long riovcnt, unsigned long flags),
        TP_ARGS(sc_exit(ret,) pid, lvec, liovcnt, rvec, riovcnt, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(const struct iovec *, lvec)) sc_in(__field(unsigned long, liovcnt)) sc_in(__field_hex(const struct iovec *, rvec)) sc_in(__field(unsigned long, riovcnt)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(lvec, lvec)) sc_in(tp_assign(liovcnt, liovcnt)) sc_in(tp_assign(rvec, rvec)) sc_in(tp_assign(riovcnt, riovcnt)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(const struct iovec *, lvec, lvec)) sc_in(ctf_integer(unsigned long, liovcnt, liovcnt)) sc_in(ctf_integer(const struct iovec *, rvec, rvec)) sc_in(ctf_integer(unsigned long, riovcnt, riovcnt)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 

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 c01d355948c8e6146fb3d29f87b0171659761393..d515e1d06ba4303894a0b699aa653f2cd515431d 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
@@ -8,21 +8,14 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap2,
        TP_PROTO(void *addr, size_t len, int prot,
                  int flags, int fd, off_t pgoff),
        TP_ARGS(addr, len, prot, flags, fd, pgoff),
-       TP_STRUCT__entry(
-               __field_hex(void *, addr)
-               __field(size_t, len)
-               __field(int, prot)
-               __field(int, flags)
-               __field(int, fd)
-               __field(off_t, pgoff)),
-       TP_fast_assign(
-               tp_assign(addr, addr)
-               tp_assign(len, len)
-               tp_assign(prot, prot)
-               tp_assign(flags, flags)
-               tp_assign(fd, fd)
-               tp_assign(pgoff, pgoff)),
-       TP_printk()
+       TP_FIELDS(
+               ctf_integer_hex(void *, addr, addr)
+               ctf_integer(size_t, len, len)
+               ctf_integer(int, prot, prot)
+               ctf_integer(int, flags, flags)
+               ctf_integer(int, fd, fd)
+               ctf_integer(off_t, pgoff, pgoff)
+       )
 )
 
 #else  /* CREATE_SYSCALL_TABLE */

diff --git a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h
index 48c2b5f8ca302bea1c02a22a968ae1a6cbba4b1e..309b8ef1c10475c4c10c95be8a315b03e2443f13 100644 (file)
--- a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h
+++ b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h
@@ -11,9 +11,7 @@
 
 #ifdef SC_ENTER
 SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscalls_noargs,
-       TP_STRUCT__entry(),
-       TP_fast_assign(),
-       TP_printk()
+       TP_FIELDS()
 )
 #ifndef OVERRIDE_32_getpid
 SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, getpid)
@@ -71,153 +69,119 @@ SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, inotify_init)
 SC_LTTNG_TRACEPOINT_EVENT(getpid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getuid
 SC_LTTNG_TRACEPOINT_EVENT(getuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_pause
 SC_LTTNG_TRACEPOINT_EVENT(pause,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sync
 SC_LTTNG_TRACEPOINT_EVENT(sync,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getgid
 SC_LTTNG_TRACEPOINT_EVENT(getgid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_geteuid
 SC_LTTNG_TRACEPOINT_EVENT(geteuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getegid
 SC_LTTNG_TRACEPOINT_EVENT(getegid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getppid
 SC_LTTNG_TRACEPOINT_EVENT(getppid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getpgrp
 SC_LTTNG_TRACEPOINT_EVENT(getpgrp,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_setsid
 SC_LTTNG_TRACEPOINT_EVENT(setsid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sgetmask
 SC_LTTNG_TRACEPOINT_EVENT(sgetmask,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_vhangup
 SC_LTTNG_TRACEPOINT_EVENT(vhangup,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_munlockall
 SC_LTTNG_TRACEPOINT_EVENT(munlockall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_yield
 SC_LTTNG_TRACEPOINT_EVENT(sched_yield,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_gettid
 SC_LTTNG_TRACEPOINT_EVENT(gettid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_restart_syscall
 SC_LTTNG_TRACEPOINT_EVENT(restart_syscall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_init
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #endif /* else #ifdef SC_ENTER */
@@ -225,756 +189,588 @@ SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
 SC_LTTNG_TRACEPOINT_EVENT(exit,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_32_close
 SC_LTTNG_TRACEPOINT_EVENT(close,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_setuid
 SC_LTTNG_TRACEPOINT_EVENT(setuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_alarm
 SC_LTTNG_TRACEPOINT_EVENT(alarm,
        TP_PROTO(sc_exit(long ret,) unsigned int seconds),
        TP_ARGS(sc_exit(ret,) seconds),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, seconds))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(seconds, seconds))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, seconds, seconds)))
 )
 #endif
 #ifndef OVERRIDE_32_nice
 SC_LTTNG_TRACEPOINT_EVENT(nice,
        TP_PROTO(sc_exit(long ret,) int increment),
        TP_ARGS(sc_exit(ret,) increment),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, increment))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(increment, increment))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, increment, increment)))
 )
 #endif
 #ifndef OVERRIDE_32_dup
 SC_LTTNG_TRACEPOINT_EVENT(dup,
        TP_PROTO(sc_exit(long ret,) unsigned int fildes),
        TP_ARGS(sc_exit(ret,) fildes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fildes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fildes, fildes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fildes, fildes)))
 )
 #endif
 #ifndef OVERRIDE_32_brk
 SC_LTTNG_TRACEPOINT_EVENT(brk,
        TP_PROTO(sc_exit(long ret,) unsigned long brk),
        TP_ARGS(sc_exit(ret,) brk),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, brk))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(brk, brk))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, brk, brk)))
 )
 #endif
 #ifndef OVERRIDE_32_setgid
 SC_LTTNG_TRACEPOINT_EVENT(setgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_umask
 SC_LTTNG_TRACEPOINT_EVENT(umask,
        TP_PROTO(sc_exit(long ret,) int mask),
        TP_ARGS(sc_exit(ret,) mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_32_ssetmask
 SC_LTTNG_TRACEPOINT_EVENT(ssetmask,
        TP_PROTO(sc_exit(long ret,) int newmask),
        TP_ARGS(sc_exit(ret,) newmask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, newmask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(newmask, newmask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, newmask, newmask)))
 )
 #endif
 #ifndef OVERRIDE_32_fsync
 SC_LTTNG_TRACEPOINT_EVENT(fsync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_getpgid
 SC_LTTNG_TRACEPOINT_EVENT(getpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_fchdir
 SC_LTTNG_TRACEPOINT_EVENT(fchdir,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_personality
 SC_LTTNG_TRACEPOINT_EVENT(personality,
        TP_PROTO(sc_exit(long ret,) unsigned int personality),
        TP_ARGS(sc_exit(ret,) personality),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, personality))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(personality, personality))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, personality, personality)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsuid
 SC_LTTNG_TRACEPOINT_EVENT(setfsuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsgid
 SC_LTTNG_TRACEPOINT_EVENT(setfsgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_getsid
 SC_LTTNG_TRACEPOINT_EVENT(getsid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_fdatasync
 SC_LTTNG_TRACEPOINT_EVENT(fdatasync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_mlockall
 SC_LTTNG_TRACEPOINT_EVENT(mlockall,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_getscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_get_priority_max
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_max,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_get_priority_min
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_min,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_32_io_destroy
 SC_LTTNG_TRACEPOINT_EVENT(io_destroy,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx),
        TP_ARGS(sc_exit(ret,) ctx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx, ctx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx, ctx)))
 )
 #endif
 #ifndef OVERRIDE_32_exit_group
 SC_LTTNG_TRACEPOINT_EVENT(exit_group,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_create
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create,
        TP_PROTO(sc_exit(long ret,) int size),
        TP_ARGS(sc_exit(ret,) size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_getoverrun
 SC_LTTNG_TRACEPOINT_EVENT(timer_getoverrun,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_delete
 SC_LTTNG_TRACEPOINT_EVENT(timer_delete,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_set_thread_area
 SC_LTTNG_TRACEPOINT_EVENT(set_thread_area,
        TP_PROTO(sc_exit(long ret,) unsigned long addr),
        TP_ARGS(sc_exit(ret,) addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)))
 )
 #endif
 #ifndef OVERRIDE_32_unshare
 SC_LTTNG_TRACEPOINT_EVENT(unshare,
        TP_PROTO(sc_exit(long ret,) unsigned long unshare_flags),
        TP_ARGS(sc_exit(ret,) unshare_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, unshare_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unshare_flags, unshare_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, unshare_flags, unshare_flags)))
 )
 #endif
 #ifndef OVERRIDE_32_eventfd
 SC_LTTNG_TRACEPOINT_EVENT(eventfd,
        TP_PROTO(sc_exit(long ret,) unsigned int count),
        TP_ARGS(sc_exit(ret,) count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_create1
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_init1
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_syncfs
 SC_LTTNG_TRACEPOINT_EVENT(syncfs,
        TP_PROTO(sc_exit(long ret,) int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_kill
 SC_LTTNG_TRACEPOINT_EVENT(kill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_setpgid
 SC_LTTNG_TRACEPOINT_EVENT(setpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, pid_t pgid),
        TP_ARGS(sc_exit(ret,) pid, pgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(pid_t, pgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(pgid, pgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(pid_t, pgid, pgid)))
 )
 #endif
 #ifndef OVERRIDE_32_dup2
 SC_LTTNG_TRACEPOINT_EVENT(dup2,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd),
        TP_ARGS(sc_exit(ret,) oldfd, newfd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)))
 )
 #endif
 #ifndef OVERRIDE_32_setreuid
 SC_LTTNG_TRACEPOINT_EVENT(setreuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid),
        TP_ARGS(sc_exit(ret,) ruid, euid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)))
 )
 #endif
 #ifndef OVERRIDE_32_setregid
 SC_LTTNG_TRACEPOINT_EVENT(setregid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid),
        TP_ARGS(sc_exit(ret,) rgid, egid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)))
 )
 #endif
 #ifndef OVERRIDE_32_munmap
 SC_LTTNG_TRACEPOINT_EVENT(munmap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, size_t len),
        TP_ARGS(sc_exit(ret,) addr, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_ftruncate
 SC_LTTNG_TRACEPOINT_EVENT(ftruncate,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long length),
        TP_ARGS(sc_exit(ret,) fd, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_fchmod
 SC_LTTNG_TRACEPOINT_EVENT(fchmod,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, umode_t mode),
        TP_ARGS(sc_exit(ret,) fd, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_getpriority
 SC_LTTNG_TRACEPOINT_EVENT(getpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_32_bdflush
 SC_LTTNG_TRACEPOINT_EVENT(bdflush,
        TP_PROTO(sc_exit(long ret,) int func, long data),
        TP_ARGS(sc_exit(ret,) func, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, func)) sc_inout(__field(long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(func, func)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, func, func)) sc_inout(ctf_integer(long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_flock
 SC_LTTNG_TRACEPOINT_EVENT(flock,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd),
        TP_ARGS(sc_exit(ret,) fd, cmd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)))
 )
 #endif
 #ifndef OVERRIDE_32_mlock
 SC_LTTNG_TRACEPOINT_EVENT(mlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_munlock
 SC_LTTNG_TRACEPOINT_EVENT(munlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_listen
 SC_LTTNG_TRACEPOINT_EVENT(listen,
        TP_PROTO(sc_exit(long ret,) int fd, int backlog),
        TP_ARGS(sc_exit(ret,) fd, backlog),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, backlog))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(backlog, backlog))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, backlog, backlog)))
 )
 #endif
 #ifndef OVERRIDE_32_shutdown
 SC_LTTNG_TRACEPOINT_EVENT(shutdown,
        TP_PROTO(sc_exit(long ret,) int fd, int how),
        TP_ARGS(sc_exit(ret,) fd, how),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, how))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(how, how))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, how, how)))
 )
 #endif
 #ifndef OVERRIDE_32_ftruncate64
 SC_LTTNG_TRACEPOINT_EVENT(ftruncate64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, loff_t length),
        TP_ARGS(sc_exit(ret,) fd, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(loff_t, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(loff_t, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_tkill
 SC_LTTNG_TRACEPOINT_EVENT(tkill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_rm_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_rm_watch,
        TP_PROTO(sc_exit(long ret,) int fd, __s32 wd),
        TP_ARGS(sc_exit(ret,) fd, wd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(__s32, wd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(wd, wd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(__s32, wd, wd)))
 )
 #endif
 #ifndef OVERRIDE_32_ioprio_get
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_get,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_create
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_create,
        TP_PROTO(sc_exit(long ret,) int clockid, int flags),
        TP_ARGS(sc_exit(ret,) clockid, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, clockid)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(clockid, clockid)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, clockid, clockid)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_eventfd2
 SC_LTTNG_TRACEPOINT_EVENT(eventfd2,
        TP_PROTO(sc_exit(long ret,) unsigned int count, int flags),
        TP_ARGS(sc_exit(ret,) count, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_setns
 SC_LTTNG_TRACEPOINT_EVENT(setns,
        TP_PROTO(sc_exit(long ret,) int fd, int nstype),
        TP_ARGS(sc_exit(ret,) fd, nstype),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, nstype))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(nstype, nstype))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, nstype, nstype)))
 )
 #endif
 #ifndef OVERRIDE_32_lseek
 SC_LTTNG_TRACEPOINT_EVENT(lseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, off_t offset, unsigned int whence),
        TP_ARGS(sc_exit(ret,) fd, offset, whence),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(off_t, offset)) sc_in(__field(unsigned int, whence))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(whence, whence))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(off_t, offset, offset)) sc_in(ctf_integer(unsigned int, whence, whence)))
 )
 #endif
 #ifndef OVERRIDE_32_ioctl
 SC_LTTNG_TRACEPOINT_EVENT(ioctl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_fcntl
 SC_LTTNG_TRACEPOINT_EVENT(fcntl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_fchown
 SC_LTTNG_TRACEPOINT_EVENT(fchown,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) fd, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_setpriority
 SC_LTTNG_TRACEPOINT_EVENT(setpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who, int niceval),
        TP_ARGS(sc_exit(ret,) which, who, niceval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, niceval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(niceval, niceval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, niceval, niceval)))
 )
 #endif
 #ifndef OVERRIDE_32_mprotect
 SC_LTTNG_TRACEPOINT_EVENT(mprotect,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned long prot),
        TP_ARGS(sc_exit(ret,) start, len, prot),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(unsigned long, prot))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(prot, prot))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned long, prot, prot)))
 )
 #endif
 #ifndef OVERRIDE_32_sysfs
 SC_LTTNG_TRACEPOINT_EVENT(sysfs,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg1, unsigned long arg2),
        TP_ARGS(sc_exit(ret,) option, arg1, arg2),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_in(__field(unsigned long, arg1)) sc_in(__field(unsigned long, arg2))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_in(tp_assign(arg1, arg1)) sc_in(tp_assign(arg2, arg2))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_in(ctf_integer(unsigned long, arg1, arg1)) sc_in(ctf_integer(unsigned long, arg2, arg2)))
 )
 #endif
 #ifndef OVERRIDE_32_msync
 SC_LTTNG_TRACEPOINT_EVENT(msync,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, int flags),
        TP_ARGS(sc_exit(ret,) start, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_cacheflush
 SC_LTTNG_TRACEPOINT_EVENT(cacheflush,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long bytes, unsigned int cache),
        TP_ARGS(sc_exit(ret,) addr, bytes, cache),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, bytes)) sc_inout(__field(unsigned int, cache))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(bytes, bytes)) sc_inout(tp_assign(cache, cache))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, bytes, bytes)) sc_inout(ctf_integer(unsigned int, cache, cache)))
 )
 #endif
 #ifndef OVERRIDE_32_sysmips
 SC_LTTNG_TRACEPOINT_EVENT(sysmips,
        TP_PROTO(sc_exit(long ret,) long cmd, long arg1, long arg2),
        TP_ARGS(sc_exit(ret,) cmd, arg1, arg2),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(long, cmd)) sc_inout(__field(long, arg1)) sc_inout(__field(long, arg2))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg1, arg1)) sc_inout(tp_assign(arg2, arg2))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(long, cmd, cmd)) sc_inout(ctf_integer(long, arg1, arg1)) sc_inout(ctf_integer(long, arg2, arg2)))
 )
 #endif
 #ifndef OVERRIDE_32_socket
 SC_LTTNG_TRACEPOINT_EVENT(socket,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol),
        TP_ARGS(sc_exit(ret,) family, type, protocol),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)))
 )
 #endif
 #ifndef OVERRIDE_32_setresuid
 SC_LTTNG_TRACEPOINT_EVENT(setresuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid, uid_t suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid)) sc_in(__field(uid_t, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid)) sc_in(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)) sc_in(ctf_integer(uid_t, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_setresgid
 SC_LTTNG_TRACEPOINT_EVENT(setresgid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid, gid_t sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid)) sc_in(__field(gid_t, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid)) sc_in(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)) sc_in(ctf_integer(gid_t, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_madvise
 SC_LTTNG_TRACEPOINT_EVENT(madvise,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len_in, int behavior),
        TP_ARGS(sc_exit(ret,) start, len_in, behavior),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len_in)) sc_in(__field(int, behavior))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len_in, len_in)) sc_in(tp_assign(behavior, behavior))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len_in, len_in)) sc_in(ctf_integer(int, behavior, behavior)))
 )
 #endif
 #ifndef OVERRIDE_32_fcntl64
 SC_LTTNG_TRACEPOINT_EVENT(fcntl64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_readahead
 SC_LTTNG_TRACEPOINT_EVENT(readahead,
        TP_PROTO(sc_exit(long ret,) int fd, loff_t offset, size_t count),
        TP_ARGS(sc_exit(ret,) fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(loff_t, offset)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(loff_t, offset, offset)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_tgkill
 SC_LTTNG_TRACEPOINT_EVENT(tgkill,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_ioprio_set
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_set,
        TP_PROTO(sc_exit(long ret,) int which, int who, int ioprio),
        TP_ARGS(sc_exit(ret,) which, who, ioprio),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, ioprio))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(ioprio, ioprio))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, ioprio, ioprio)))
 )
 #endif
 #ifndef OVERRIDE_32_dup3
 SC_LTTNG_TRACEPOINT_EVENT(dup3,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd, int flags),
        TP_ARGS(sc_exit(ret,) oldfd, newfd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ptrace
 SC_LTTNG_TRACEPOINT_EVENT(ptrace,
        TP_PROTO(sc_exit(long ret,) long request, long pid, unsigned long addr, unsigned long data),
        TP_ARGS(sc_exit(ret,) request, pid, addr, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(long, request)) sc_in(__field(long, pid)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(request, request)) sc_in(tp_assign(pid, pid)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(long, request, request)) sc_in(ctf_integer(long, pid, pid)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_fadvise64_64
 SC_LTTNG_TRACEPOINT_EVENT(fadvise64_64,
        TP_PROTO(sc_exit(long ret,) int fd, loff_t offset, loff_t len, int advice),
        TP_ARGS(sc_exit(ret,) fd, offset, len, advice),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, fd)) sc_inout(__field(loff_t, offset)) sc_inout(__field(loff_t, len)) sc_inout(__field(int, advice))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset, offset)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(advice, advice))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(loff_t, offset, offset)) sc_inout(ctf_integer(loff_t, len, len)) sc_inout(ctf_integer(int, advice, advice)))
 )
 #endif
 #ifndef OVERRIDE_32_sync_file_range
 SC_LTTNG_TRACEPOINT_EVENT(sync_file_range,
        TP_PROTO(sc_exit(long ret,) int fd, loff_t offset, loff_t nbytes, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, offset, nbytes, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(loff_t, offset)) sc_in(__field(loff_t, nbytes)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(nbytes, nbytes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(loff_t, offset, offset)) sc_in(ctf_integer(loff_t, nbytes, nbytes)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_tee
 SC_LTTNG_TRACEPOINT_EVENT(tee,
        TP_PROTO(sc_exit(long ret,) int fdin, int fdout, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fdin, fdout, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fdin)) sc_in(__field(int, fdout)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fdin, fdin)) sc_in(tp_assign(fdout, fdout)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fdin, fdin)) sc_in(ctf_integer(int, fdout, fdout)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_fallocate
 SC_LTTNG_TRACEPOINT_EVENT(fallocate,
        TP_PROTO(sc_exit(long ret,) int fd, int mode, loff_t offset, loff_t len),
        TP_ARGS(sc_exit(ret,) fd, mode, offset, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, mode)) sc_in(__field(loff_t, offset)) sc_in(__field(loff_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, mode, mode)) sc_in(ctf_integer(loff_t, offset, offset)) sc_in(ctf_integer(loff_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_mremap
 SC_LTTNG_TRACEPOINT_EVENT(mremap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr),
        TP_ARGS(sc_exit(ret,) addr, old_len, new_len, flags, new_addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(unsigned long, old_len)) sc_in(__field(unsigned long, new_len)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(unsigned long, new_addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(old_len, old_len)) sc_in(tp_assign(new_len, new_len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_addr, new_addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(unsigned long, old_len, old_len)) sc_in(ctf_integer(unsigned long, new_len, new_len)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(unsigned long, new_addr, new_addr)))
 )
 #endif
 #ifndef OVERRIDE_32_prctl
 SC_LTTNG_TRACEPOINT_EVENT(prctl,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(sc_exit(ret,) option, arg2, arg3, arg4, arg5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_inout(__field(unsigned long, arg2)) sc_in(__field(unsigned long, arg3)) sc_in(__field(unsigned long, arg4)) sc_in(__field(unsigned long, arg5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_inout(tp_assign(arg2, arg2)) sc_in(tp_assign(arg3, arg3)) sc_in(tp_assign(arg4, arg4)) sc_in(tp_assign(arg5, arg5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_inout(ctf_integer(unsigned long, arg2, arg2)) sc_in(ctf_integer(unsigned long, arg3, arg3)) sc_in(ctf_integer(unsigned long, arg4, arg4)) sc_in(ctf_integer(unsigned long, arg5, arg5)))
 )
 #endif
 #ifndef OVERRIDE_32_remap_file_pages
 SC_LTTNG_TRACEPOINT_EVENT(remap_file_pages,
        TP_PROTO(sc_exit(long ret,) unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long flags),
        TP_ARGS(sc_exit(ret,) start, size, prot, pgoff, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(unsigned long, size)) sc_in(__field(unsigned long, prot)) sc_in(__field(unsigned long, pgoff)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(size, size)) sc_in(tp_assign(prot, prot)) sc_in(tp_assign(pgoff, pgoff)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(unsigned long, size, size)) sc_in(ctf_integer(unsigned long, prot, prot)) sc_in(ctf_integer(unsigned long, pgoff, pgoff)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_mips_mmap
 SC_LTTNG_TRACEPOINT_EVENT(mips_mmap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, off_t offset),
        TP_ARGS(sc_exit(ret,) addr, len, prot, flags, fd, offset),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, len)) sc_inout(__field(unsigned long, prot)) sc_inout(__field(unsigned long, flags)) sc_inout(__field(unsigned long, fd)) sc_inout(__field(off_t, offset))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(prot, prot)) sc_inout(tp_assign(flags, flags)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset, offset))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, len, len)) sc_inout(ctf_integer(unsigned long, prot, prot)) sc_inout(ctf_integer(unsigned long, flags, flags)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(off_t, offset, offset)))
 )
 #endif
 #ifndef OVERRIDE_32_mips_mmap2
 SC_LTTNG_TRACEPOINT_EVENT(mips_mmap2,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff),
        TP_ARGS(sc_exit(ret,) addr, len, prot, flags, fd, pgoff),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, len)) sc_inout(__field(unsigned long, prot)) sc_inout(__field(unsigned long, flags)) sc_inout(__field(unsigned long, fd)) sc_inout(__field(unsigned long, pgoff))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(prot, prot)) sc_inout(tp_assign(flags, flags)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(pgoff, pgoff))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, len, len)) sc_inout(ctf_integer(unsigned long, prot, prot)) sc_inout(ctf_integer(unsigned long, flags, flags)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(unsigned long, pgoff, pgoff)))
 )
 #endif
 

diff --git a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h
index 5564ddef552660f4973a46b70a67a2e988cf1060..22f57e5242b1645f4aefcc4e91d43c16097d1334 100644 (file)
--- a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h
+++ b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h
@@ -13,1620 +13,1260 @@
 SC_LTTNG_TRACEPOINT_EVENT(unlink,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_32_chdir
 SC_LTTNG_TRACEPOINT_EVENT(chdir,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_32_time
 SC_LTTNG_TRACEPOINT_EVENT(time,
        TP_PROTO(sc_exit(long ret,) time_t * tloc),
        TP_ARGS(sc_exit(ret,) tloc),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(time_t *, tloc))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tloc, tloc))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(time_t *, tloc, tloc)))
 )
 #endif
 #ifndef OVERRIDE_32_oldumount
 SC_LTTNG_TRACEPOINT_EVENT(oldumount,
        TP_PROTO(sc_exit(long ret,) char * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_stime
 SC_LTTNG_TRACEPOINT_EVENT(stime,
        TP_PROTO(sc_exit(long ret,) time_t * tptr),
        TP_ARGS(sc_exit(ret,) tptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(time_t *, tptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(tptr, tptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(time_t *, tptr, tptr)))
 )
 #endif
 #ifndef OVERRIDE_32_rmdir
 SC_LTTNG_TRACEPOINT_EVENT(rmdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_32_times
 SC_LTTNG_TRACEPOINT_EVENT(times,
        TP_PROTO(sc_exit(long ret,) struct tms * tbuf),
        TP_ARGS(sc_exit(ret,) tbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct tms *, tbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tbuf, tbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct tms *, tbuf, tbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_olduname
 SC_LTTNG_TRACEPOINT_EVENT(olduname,
        TP_PROTO(sc_exit(long ret,) struct oldold_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct oldold_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct oldold_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_chroot
 SC_LTTNG_TRACEPOINT_EVENT(chroot,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_32_sigsuspend
 SC_LTTNG_TRACEPOINT_EVENT(sigsuspend,
        TP_PROTO(sc_exit(long ret,) sigset_t * uset),
        TP_ARGS(sc_exit(ret,) uset),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(sigset_t *, uset))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uset, uset))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(sigset_t *, uset, uset)))
 )
 #endif
 #ifndef OVERRIDE_32_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(sigpending,
        TP_PROTO(sc_exit(long ret,) old_sigset_t * set),
        TP_ARGS(sc_exit(ret,) set),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(old_sigset_t *, set))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(set, set))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_sigset_t *, set, set)))
 )
 #endif
 #ifndef OVERRIDE_32_uselib
 SC_LTTNG_TRACEPOINT_EVENT(uselib,
        TP_PROTO(sc_exit(long ret,) const char * library),
        TP_ARGS(sc_exit(ret,) library),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(const char *, library))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(library, library))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(const char *, library, library)))
 )
 #endif
 #ifndef OVERRIDE_32_uname
 SC_LTTNG_TRACEPOINT_EVENT(uname,
        TP_PROTO(sc_exit(long ret,) struct old_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct old_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct old_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_sysinfo
 SC_LTTNG_TRACEPOINT_EVENT(sysinfo,
        TP_PROTO(sc_exit(long ret,) struct sysinfo * info),
        TP_ARGS(sc_exit(ret,) info),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct sysinfo *, info))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(info, info))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct sysinfo *, info, info)))
 )
 #endif
 #ifndef OVERRIDE_32_newuname
 SC_LTTNG_TRACEPOINT_EVENT(newuname,
        TP_PROTO(sc_exit(long ret,) struct new_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct new_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct new_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_adjtimex
 SC_LTTNG_TRACEPOINT_EVENT(adjtimex,
        TP_PROTO(sc_exit(long ret,) struct timex * txc_p),
        TP_ARGS(sc_exit(ret,) txc_p),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct timex *, txc_p))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(txc_p, txc_p))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct timex *, txc_p, txc_p)))
 )
 #endif
 #ifndef OVERRIDE_32_sysctl
 SC_LTTNG_TRACEPOINT_EVENT(sysctl,
        TP_PROTO(sc_exit(long ret,) struct __sysctl_args * args),
        TP_ARGS(sc_exit(ret,) args),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct __sysctl_args *, args))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(args, args))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct __sysctl_args *, args, args)))
 )
 #endif
 #ifndef OVERRIDE_32_set_tid_address
 SC_LTTNG_TRACEPOINT_EVENT(set_tid_address,
        TP_PROTO(sc_exit(long ret,) int * tidptr),
        TP_ARGS(sc_exit(ret,) tidptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(int *, tidptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tidptr, tidptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int *, tidptr, tidptr)))
 )
 #endif
 #ifndef OVERRIDE_32_creat
 SC_LTTNG_TRACEPOINT_EVENT(creat,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_link
 SC_LTTNG_TRACEPOINT_EVENT(link,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_chmod
 SC_LTTNG_TRACEPOINT_EVENT(chmod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_utime
 SC_LTTNG_TRACEPOINT_EVENT(utime,
        TP_PROTO(sc_exit(long ret,) char * filename, struct utimbuf * times),
        TP_ARGS(sc_exit(ret,) filename, times),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct utimbuf *, times))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(times, times))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct utimbuf *, times, times)))
 )
 #endif
 #ifndef OVERRIDE_32_access
 SC_LTTNG_TRACEPOINT_EVENT(access,
        TP_PROTO(sc_exit(long ret,) const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_rename
 SC_LTTNG_TRACEPOINT_EVENT(rename,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_mkdir
 SC_LTTNG_TRACEPOINT_EVENT(mkdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_umount
 SC_LTTNG_TRACEPOINT_EVENT(umount,
        TP_PROTO(sc_exit(long ret,) char * name, int flags),
        TP_ARGS(sc_exit(ret,) name, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ustat
 SC_LTTNG_TRACEPOINT_EVENT(ustat,
        TP_PROTO(sc_exit(long ret,) unsigned dev, struct ustat * ubuf),
        TP_ARGS(sc_exit(ret,) dev, ubuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, dev)) sc_out(__field_hex(struct ustat *, ubuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dev, dev)) sc_out(tp_assign(ubuf, ubuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, dev, dev)) sc_out(ctf_integer(struct ustat *, ubuf, ubuf)))
 )
 #endif
 #ifndef OVERRIDE_32_sethostname
 SC_LTTNG_TRACEPOINT_EVENT(sethostname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setrlimit
 SC_LTTNG_TRACEPOINT_EVENT(setrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_getrlimit
 SC_LTTNG_TRACEPOINT_EVENT(getrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_out(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_out(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_out(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_getrusage
 SC_LTTNG_TRACEPOINT_EVENT(getrusage,
        TP_PROTO(sc_exit(long ret,) int who, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) who, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, who)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(who, who)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, who, who)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_gettimeofday
 SC_LTTNG_TRACEPOINT_EVENT(gettimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct timeval *, tv)) sc_out(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tv, tv)) sc_out(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct timeval *, tv, tv)) sc_out(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_32_settimeofday
 SC_LTTNG_TRACEPOINT_EVENT(settimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timeval *, tv)) sc_in(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tv, tv)) sc_in(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timeval *, tv, tv)) sc_in(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_32_getgroups
 SC_LTTNG_TRACEPOINT_EVENT(getgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_out(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_out(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_out(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_setgroups
 SC_LTTNG_TRACEPOINT_EVENT(setgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_in(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_in(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_in(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_symlink
 SC_LTTNG_TRACEPOINT_EVENT(symlink,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_truncate
 SC_LTTNG_TRACEPOINT_EVENT(truncate,
        TP_PROTO(sc_exit(long ret,) const char * path, long length),
        TP_ARGS(sc_exit(ret,) path, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_in(__field(long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_in(ctf_integer(long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_statfs
 SC_LTTNG_TRACEPOINT_EVENT(statfs,
        TP_PROTO(sc_exit(long ret,) const char * pathname, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) pathname, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatfs
 SC_LTTNG_TRACEPOINT_EVENT(fstatfs,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) fd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_socketcall
 SC_LTTNG_TRACEPOINT_EVENT(socketcall,
        TP_PROTO(sc_exit(long ret,) int call, unsigned long * args),
        TP_ARGS(sc_exit(ret,) call, args),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, call)) sc_inout(__field_hex(unsigned long *, args))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(call, call)) sc_inout(tp_assign(args, args))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, call, call)) sc_inout(ctf_integer(unsigned long *, args, args)))
 )
 #endif
 #ifndef OVERRIDE_32_getitimer
 SC_LTTNG_TRACEPOINT_EVENT(getitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value),
        TP_ARGS(sc_exit(ret,) which, value),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_out(__field_hex(struct itimerval *, value))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_out(tp_assign(value, value))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_out(ctf_integer(struct itimerval *, value, value)))
 )
 #endif
 #ifndef OVERRIDE_32_newstat
 SC_LTTNG_TRACEPOINT_EVENT(newstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_newlstat
 SC_LTTNG_TRACEPOINT_EVENT(newlstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_newfstat
 SC_LTTNG_TRACEPOINT_EVENT(newfstat,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_setdomainname
 SC_LTTNG_TRACEPOINT_EVENT(setdomainname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_delete_module
 SC_LTTNG_TRACEPOINT_EVENT(delete_module,
        TP_PROTO(sc_exit(long ret,) const char * name_user, unsigned int flags),
        TP_ARGS(sc_exit(ret,) name_user, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name_user, name_user)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name_user, name_user)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name_user, name_user)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_setparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_getparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_rr_get_interval
 SC_LTTNG_TRACEPOINT_EVENT(sched_rr_get_interval,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct timespec * interval),
        TP_ARGS(sc_exit(ret,) pid, interval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct timespec *, interval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(interval, interval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct timespec *, interval, interval)))
 )
 #endif
 #ifndef OVERRIDE_32_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(nanosleep,
        TP_PROTO(sc_exit(long ret,) struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigpending,
        TP_PROTO(sc_exit(long ret,) sigset_t * uset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(sigset_t *, uset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(uset, uset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(sigset_t *, uset, uset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigsuspend
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigsuspend,
        TP_PROTO(sc_exit(long ret,) sigset_t * unewset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) unewset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(sigset_t *, unewset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unewset, unewset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(sigset_t *, unewset, unewset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_getcwd
 SC_LTTNG_TRACEPOINT_EVENT(getcwd,
        TP_PROTO(sc_exit(long ret,) char * buf, unsigned long size),
        TP_ARGS(sc_exit(ret,) buf, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(char *, buf)) sc_in(__field(unsigned long, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(unsigned long, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_sigaltstack
 SC_LTTNG_TRACEPOINT_EVENT(sigaltstack,
        TP_PROTO(sc_exit(long ret,) const stack_t * uss, stack_t * uoss),
        TP_ARGS(sc_exit(ret,) uss, uoss),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(const stack_t *, uss)) sc_inout(__field_hex(stack_t *, uoss))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uss, uss)) sc_inout(tp_assign(uoss, uoss))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const stack_t *, uss, uss)) sc_inout(ctf_integer(stack_t *, uoss, uoss)))
 )
 #endif
 #ifndef OVERRIDE_32_truncate64
 SC_LTTNG_TRACEPOINT_EVENT(truncate64,
        TP_PROTO(sc_exit(long ret,) const char * path, loff_t length),
        TP_ARGS(sc_exit(ret,) path, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(path, path)) sc_inout(__field(loff_t, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(path, path)) sc_inout(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(path, path)) sc_inout(ctf_integer(loff_t, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_stat64
 SC_LTTNG_TRACEPOINT_EVENT(stat64,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_lstat64
 SC_LTTNG_TRACEPOINT_EVENT(lstat64,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstat64
 SC_LTTNG_TRACEPOINT_EVENT(fstat64,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, fd)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_pivot_root
 SC_LTTNG_TRACEPOINT_EVENT(pivot_root,
        TP_PROTO(sc_exit(long ret,) const char * new_root, const char * put_old),
        TP_ARGS(sc_exit(ret,) new_root, put_old),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(new_root, new_root)) sc_in(__string_from_user(put_old, put_old))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(new_root, new_root)) sc_in(tp_copy_string_from_user(put_old, put_old))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(new_root, new_root)) sc_in(ctf_user_string(put_old, put_old)))
 )
 #endif
 #ifndef OVERRIDE_32_removexattr
 SC_LTTNG_TRACEPOINT_EVENT(removexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_lremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(lremovexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_fremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(fremovexattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name),
        TP_ARGS(sc_exit(ret,) fd, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_io_setup
 SC_LTTNG_TRACEPOINT_EVENT(io_setup,
        TP_PROTO(sc_exit(long ret,) unsigned nr_events, aio_context_t * ctxp),
        TP_ARGS(sc_exit(ret,) nr_events, ctxp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, nr_events)) sc_in(__field_hex(aio_context_t *, ctxp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(nr_events, nr_events)) sc_in(tp_assign(ctxp, ctxp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, nr_events, nr_events)) sc_in(ctf_integer(aio_context_t *, ctxp, ctxp)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timer_gettime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, struct itimerspec * setting),
        TP_ARGS(sc_exit(ret,) timer_id, setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_out(__field_hex(struct itimerspec *, setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_out(tp_assign(setting, setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_out(ctf_integer(struct itimerspec *, setting, setting)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_settime
 SC_LTTNG_TRACEPOINT_EVENT(clock_settime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, const struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(const struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(const struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_gettime
 SC_LTTNG_TRACEPOINT_EVENT(clock_gettime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_getres
 SC_LTTNG_TRACEPOINT_EVENT(clock_getres,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_utimes
 SC_LTTNG_TRACEPOINT_EVENT(utimes,
        TP_PROTO(sc_exit(long ret,) char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_32_set_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(set_robust_list,
        TP_PROTO(sc_exit(long ret,) struct robust_list_head * head, size_t len),
        TP_ARGS(sc_exit(ret,) head, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct robust_list_head *, head)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(head, head)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct robust_list_head *, head, head)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_gettime,
        TP_PROTO(sc_exit(long ret,) int ufd, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_32_pipe2
 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(__field_hex(int *, fildes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(fildes, fildes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(int *, fildes, fildes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_adjtime
 SC_LTTNG_TRACEPOINT_EVENT(clock_adjtime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timex * utx),
        TP_ARGS(sc_exit(ret,) which_clock, utx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_inout(__field_hex(struct timex *, utx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_inout(tp_assign(utx, utx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_inout(ctf_integer(struct timex *, utx, utx)))
 )
 #endif
 #ifndef OVERRIDE_32_read
 SC_LTTNG_TRACEPOINT_EVENT(read,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_write
 SC_LTTNG_TRACEPOINT_EVENT(write,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(const char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_open
 SC_LTTNG_TRACEPOINT_EVENT(open,
        TP_PROTO(sc_exit(long ret,) const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_waitpid
 SC_LTTNG_TRACEPOINT_EVENT(waitpid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int * stat_addr, int options),
        TP_ARGS(sc_exit(ret,) pid, stat_addr, options),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(pid_t, pid)) sc_inout(__field_hex(int *, stat_addr)) sc_inout(__field(int, options))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(pid, pid)) sc_inout(tp_assign(stat_addr, stat_addr)) sc_inout(tp_assign(options, options))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(pid_t, pid, pid)) sc_inout(ctf_integer(int *, stat_addr, stat_addr)) sc_inout(ctf_integer(int, options, options)))
 )
 #endif
 #ifndef OVERRIDE_32_execve
 SC_LTTNG_TRACEPOINT_EVENT(execve,
        TP_PROTO(sc_exit(long ret,) const char * filename, const char *const * argv, const char *const * envp),
        TP_ARGS(sc_exit(ret,) filename, argv, envp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(const char *const *, argv)) sc_inout(__field_hex(const char *const *, envp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(argv, argv)) sc_inout(tp_assign(envp, envp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(const char *const *, argv, argv)) sc_inout(ctf_integer(const char *const *, envp, envp)))
 )
 #endif
 #ifndef OVERRIDE_32_mknod
 SC_LTTNG_TRACEPOINT_EVENT(mknod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_32_lchown
 SC_LTTNG_TRACEPOINT_EVENT(lchown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction * act, struct sigaction * oact),
        TP_ARGS(sc_exit(ret,) sig, act, oact),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, sig)) sc_inout(__field_hex(const struct sigaction *, act)) sc_inout(__field_hex(struct sigaction *, oact))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(sig, sig)) sc_inout(tp_assign(act, act)) sc_inout(tp_assign(oact, oact))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, sig, sig)) sc_inout(ctf_integer(const struct sigaction *, act, act)) sc_inout(ctf_integer(struct sigaction *, oact, oact)))
 )
 #endif
 #ifndef OVERRIDE_32_readlink
 SC_LTTNG_TRACEPOINT_EVENT(readlink,
        TP_PROTO(sc_exit(long ret,) const char * path, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) path, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_32_old_readdir
 SC_LTTNG_TRACEPOINT_EVENT(old_readdir,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct old_linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field_hex(struct old_linux_dirent *, dirent)) sc_inout(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(dirent, dirent)) sc_inout(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(struct old_linux_dirent *, dirent, dirent)) sc_inout(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_syslog
 SC_LTTNG_TRACEPOINT_EVENT(syslog,
        TP_PROTO(sc_exit(long ret,) int type, char * buf, int len),
        TP_ARGS(sc_exit(ret,) type, buf, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, type)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(type, type)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, type, type)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setitimer
 SC_LTTNG_TRACEPOINT_EVENT(setitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value, struct itimerval * ovalue),
        TP_ARGS(sc_exit(ret,) which, value, ovalue),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field_hex(struct itimerval *, value)) sc_out(__field_hex(struct itimerval *, ovalue))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(value, value)) sc_out(tp_assign(ovalue, ovalue))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(struct itimerval *, value, value)) sc_out(ctf_integer(struct itimerval *, ovalue, ovalue)))
 )
 #endif
 #ifndef OVERRIDE_32_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, old_sigset_t * nset, old_sigset_t * oset),
        TP_ARGS(sc_exit(ret,) how, nset, oset),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, how)) sc_inout(__field_hex(old_sigset_t *, nset)) sc_inout(__field_hex(old_sigset_t *, oset))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(how, how)) sc_inout(tp_assign(nset, nset)) sc_inout(tp_assign(oset, oset))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, how, how)) sc_inout(ctf_integer(old_sigset_t *, nset, nset)) sc_inout(ctf_integer(old_sigset_t *, oset, oset)))
 )
 #endif
 #ifndef OVERRIDE_32_init_module
 SC_LTTNG_TRACEPOINT_EVENT(init_module,
        TP_PROTO(sc_exit(long ret,) void * umod, unsigned long len, const char * uargs),
        TP_ARGS(sc_exit(ret,) umod, len, uargs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(void *, umod)) sc_in(__field(unsigned long, len)) sc_in(__field_hex(const char *, uargs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(umod, umod)) sc_in(tp_assign(len, len)) sc_in(tp_assign(uargs, uargs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(void *, umod, umod)) sc_in(ctf_integer(unsigned long, len, len)) sc_in(ctf_integer(const char *, uargs, uargs)))
 )
 #endif
 #ifndef OVERRIDE_32_getdents
 SC_LTTNG_TRACEPOINT_EVENT(getdents,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_readv
 SC_LTTNG_TRACEPOINT_EVENT(readv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_32_writev
 SC_LTTNG_TRACEPOINT_EVENT(writev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_32_cachectl
 SC_LTTNG_TRACEPOINT_EVENT(cachectl,
        TP_PROTO(sc_exit(long ret,) char * addr, int nbytes, int op),
        TP_ARGS(sc_exit(ret,) addr, nbytes, op),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(char *, addr)) sc_inout(__field(int, nbytes)) sc_inout(__field(int, op))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(nbytes, nbytes)) sc_inout(tp_assign(op, op))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(char *, addr, addr)) sc_inout(ctf_integer(int, nbytes, nbytes)) sc_inout(ctf_integer(int, op, op)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_setscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int policy, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, policy, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, policy)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(policy, policy)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, policy, policy)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_accept
 SC_LTTNG_TRACEPOINT_EVENT(accept,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_bind
 SC_LTTNG_TRACEPOINT_EVENT(bind,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * umyaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, umyaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, umyaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(umyaddr, umyaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, umyaddr, umyaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_connect
 SC_LTTNG_TRACEPOINT_EVENT(connect,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, uservaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(uservaddr, uservaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, uservaddr, uservaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_getpeername
 SC_LTTNG_TRACEPOINT_EVENT(getpeername,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_getsockname
 SC_LTTNG_TRACEPOINT_EVENT(getsockname,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_recvmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_inout(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sendmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_getresuid
 SC_LTTNG_TRACEPOINT_EVENT(getresuid,
        TP_PROTO(sc_exit(long ret,) uid_t * ruidp, uid_t * euidp, uid_t * suidp),
        TP_ARGS(sc_exit(ret,) ruidp, euidp, suidp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(uid_t *, ruidp)) sc_out(__field_hex(uid_t *, euidp)) sc_out(__field_hex(uid_t *, suidp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(ruidp, ruidp)) sc_out(tp_assign(euidp, euidp)) sc_out(tp_assign(suidp, suidp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(uid_t *, ruidp, ruidp)) sc_out(ctf_integer(uid_t *, euidp, euidp)) sc_out(ctf_integer(uid_t *, suidp, suidp)))
 )
 #endif
 #ifndef OVERRIDE_32_poll
 SC_LTTNG_TRACEPOINT_EVENT(poll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, int timeout_msecs),
        TP_ARGS(sc_exit(ret,) ufds, nfds, timeout_msecs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field(int, timeout_msecs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(timeout_msecs, timeout_msecs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(int, timeout_msecs, timeout_msecs)))
 )
 #endif
 #ifndef OVERRIDE_32_getresgid
 SC_LTTNG_TRACEPOINT_EVENT(getresgid,
        TP_PROTO(sc_exit(long ret,) gid_t * rgidp, gid_t * egidp, gid_t * sgidp),
        TP_ARGS(sc_exit(ret,) rgidp, egidp, sgidp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(gid_t *, rgidp)) sc_out(__field_hex(gid_t *, egidp)) sc_out(__field_hex(gid_t *, sgidp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(rgidp, rgidp)) sc_out(tp_assign(egidp, egidp)) sc_out(tp_assign(sgidp, sgidp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(gid_t *, rgidp, rgidp)) sc_out(ctf_integer(gid_t *, egidp, egidp)) sc_out(ctf_integer(gid_t *, sgidp, sgidp)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_32_chown
 SC_LTTNG_TRACEPOINT_EVENT(chown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_mincore
 SC_LTTNG_TRACEPOINT_EVENT(mincore,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned char * vec),
        TP_ARGS(sc_exit(ret,) start, len, vec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_out(__field_hex(unsigned char *, vec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_out(tp_assign(vec, vec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_out(ctf_integer(unsigned char *, vec, vec)))
 )
 #endif
 #ifndef OVERRIDE_32_getdents64
 SC_LTTNG_TRACEPOINT_EVENT(getdents64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent64 * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent64 *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent64 *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_listxattr
 SC_LTTNG_TRACEPOINT_EVENT(listxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_llistxattr
 SC_LTTNG_TRACEPOINT_EVENT(llistxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_flistxattr
 SC_LTTNG_TRACEPOINT_EVENT(flistxattr,
        TP_PROTO(sc_exit(long ret,) int fd, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) fd, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_io_submit
 SC_LTTNG_TRACEPOINT_EVENT(io_submit,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long nr, struct iocb * * iocbpp),
        TP_ARGS(sc_exit(ret,) ctx_id, nr, iocbpp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, nr)) sc_in(__field_hex(struct iocb * *, iocbpp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(nr, nr)) sc_in(tp_assign(iocbpp, iocbpp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, nr, nr)) sc_in(ctf_integer(struct iocb * *, iocbpp, iocbpp)))
 )
 #endif
 #ifndef OVERRIDE_32_io_cancel
 SC_LTTNG_TRACEPOINT_EVENT(io_cancel,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, struct iocb * iocb, struct io_event * result),
        TP_ARGS(sc_exit(ret,) ctx_id, iocb, result),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field_hex(struct iocb *, iocb)) sc_out(__field_hex(struct io_event *, result))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(iocb, iocb)) sc_out(tp_assign(result, result))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(struct iocb *, iocb, iocb)) sc_out(ctf_integer(struct io_event *, result, result)))
 )
 #endif
 #ifndef OVERRIDE_32_statfs64
 SC_LTTNG_TRACEPOINT_EVENT(statfs64,
        TP_PROTO(sc_exit(long ret,) const char * pathname, size_t sz, struct statfs64 * buf),
        TP_ARGS(sc_exit(ret,) pathname, sz, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(pathname, pathname)) sc_inout(__field(size_t, sz)) sc_inout(__field_hex(struct statfs64 *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(pathname, pathname)) sc_inout(tp_assign(sz, sz)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(pathname, pathname)) sc_inout(ctf_integer(size_t, sz, sz)) sc_inout(ctf_integer(struct statfs64 *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatfs64
 SC_LTTNG_TRACEPOINT_EVENT(fstatfs64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, size_t sz, struct statfs64 * buf),
        TP_ARGS(sc_exit(ret,) fd, sz, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(size_t, sz)) sc_inout(__field_hex(struct statfs64 *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(sz, sz)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(size_t, sz, sz)) sc_inout(ctf_integer(struct statfs64 *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_create
 SC_LTTNG_TRACEPOINT_EVENT(timer_create,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct sigevent * timer_event_spec, timer_t * created_timer_id),
        TP_ARGS(sc_exit(ret,) which_clock, timer_event_spec, created_timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(struct sigevent *, timer_event_spec)) sc_out(__field_hex(timer_t *, created_timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(timer_event_spec, timer_event_spec)) sc_out(tp_assign(created_timer_id, created_timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(struct sigevent *, timer_event_spec, timer_event_spec)) sc_out(ctf_integer(timer_t *, created_timer_id, created_timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_add_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_add_watch,
        TP_PROTO(sc_exit(long ret,) int fd, const char * pathname, u32 mask),
        TP_ARGS(sc_exit(ret,) fd, pathname, mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(u32, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(u32, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_32_mkdirat
 SC_LTTNG_TRACEPOINT_EVENT(mkdirat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_futimesat
 SC_LTTNG_TRACEPOINT_EVENT(futimesat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_32_unlinkat
 SC_LTTNG_TRACEPOINT_EVENT(unlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, int flag),
        TP_ARGS(sc_exit(ret,) dfd, pathname, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_symlinkat
 SC_LTTNG_TRACEPOINT_EVENT(symlinkat,
        TP_PROTO(sc_exit(long ret,) const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_fchmodat
 SC_LTTNG_TRACEPOINT_EVENT(fchmodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_faccessat
 SC_LTTNG_TRACEPOINT_EVENT(faccessat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_get_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(get_robust_list,
        TP_PROTO(sc_exit(long ret,) int pid, struct robust_list_head * * head_ptr, size_t * len_ptr),
        TP_ARGS(sc_exit(ret,) pid, head_ptr, len_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, pid)) sc_out(__field_hex(struct robust_list_head * *, head_ptr)) sc_out(__field_hex(size_t *, len_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(head_ptr, head_ptr)) sc_out(tp_assign(len_ptr, len_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, pid, pid)) sc_out(ctf_integer(struct robust_list_head * *, head_ptr, head_ptr)) sc_out(ctf_integer(size_t *, len_ptr, len_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_getcpu
 SC_LTTNG_TRACEPOINT_EVENT(getcpu,
        TP_PROTO(sc_exit(long ret,) unsigned * cpup, unsigned * nodep, struct getcpu_cache * unused),
        TP_ARGS(sc_exit(ret,) cpup, nodep, unused),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(unsigned *, cpup)) sc_out(__field_hex(unsigned *, nodep)) sc_inout(__field_hex(struct getcpu_cache *, unused))),
-       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(unused, unused))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(unsigned *, cpup, cpup)) sc_out(ctf_integer(unsigned *, nodep, nodep)) sc_inout(ctf_integer(struct getcpu_cache *, unused, unused)))
 )
 #endif
 #ifndef OVERRIDE_32_signalfd
 SC_LTTNG_TRACEPOINT_EVENT(signalfd,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)))
 )
 #endif
 #ifndef OVERRIDE_32_open_by_handle_at
 SC_LTTNG_TRACEPOINT_EVENT(open_by_handle_at,
        TP_PROTO(sc_exit(long ret,) int mountdirfd, struct file_handle * handle, int flags),
        TP_ARGS(sc_exit(ret,) mountdirfd, handle, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mountdirfd)) sc_in(__field_hex(struct file_handle *, handle)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mountdirfd, mountdirfd)) sc_in(tp_assign(handle, handle)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, mountdirfd, mountdirfd)) sc_in(ctf_integer(struct file_handle *, handle, handle)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_reboot
 SC_LTTNG_TRACEPOINT_EVENT(reboot,
        TP_PROTO(sc_exit(long ret,) int magic1, int magic2, unsigned int cmd, void * arg),
        TP_ARGS(sc_exit(ret,) magic1, magic2, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, magic1)) sc_in(__field(int, magic2)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(void *, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(magic1, magic1)) sc_in(tp_assign(magic2, magic2)) sc_in(tp_assign(cmd, cmd)) sc_in(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, magic1, magic1)) sc_in(ctf_integer(int, magic2, magic2)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_in(ctf_integer(void *, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_wait4
 SC_LTTNG_TRACEPOINT_EVENT(wait4,
        TP_PROTO(sc_exit(long ret,) pid_t upid, int * stat_addr, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) upid, stat_addr, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(int *, stat_addr)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(stat_addr, stat_addr)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(int *, stat_addr, stat_addr)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_send
 SC_LTTNG_TRACEPOINT_EVENT(send,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, fd)) sc_inout(__field_hex(void *, buff)) sc_inout(__field(size_t, len)) sc_inout(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(buff, buff)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(void *, buff, buff)) sc_inout(ctf_integer(size_t, len, len)) sc_inout(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_socketpair
 SC_LTTNG_TRACEPOINT_EVENT(socketpair,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol, int * usockvec),
        TP_ARGS(sc_exit(ret,) family, type, protocol, usockvec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol)) sc_out(__field_hex(int *, usockvec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol)) sc_out(tp_assign(usockvec, usockvec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)) sc_out(ctf_integer(int *, usockvec, usockvec)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction * act, struct sigaction * oact, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) sig, act, oact, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, sig)) sc_in(__field_hex(const struct sigaction *, act)) sc_out(__field_hex(struct sigaction *, oact)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(act, act)) sc_out(tp_assign(oact, oact)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(const struct sigaction *, act, act)) sc_out(ctf_integer(struct sigaction *, oact, oact)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, sigset_t * nset, sigset_t * oset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) how, nset, oset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, how)) sc_in(__field_hex(sigset_t *, nset)) sc_out(__field_hex(sigset_t *, oset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(how, how)) sc_in(tp_assign(nset, nset)) sc_out(tp_assign(oset, oset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, how, how)) sc_in(ctf_integer(sigset_t *, nset, nset)) sc_out(ctf_integer(sigset_t *, oset, oset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigtimedwait
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigtimedwait,
        TP_PROTO(sc_exit(long ret,) const sigset_t * uthese, siginfo_t * uinfo, const struct timespec * uts, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uthese, uinfo, uts, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(const sigset_t *, uthese)) sc_out(__field_hex(siginfo_t *, uinfo)) sc_in(__field_hex(const struct timespec *, uts)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(uthese, uthese)) sc_out(tp_assign(uinfo, uinfo)) sc_in(tp_assign(uts, uts)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(const sigset_t *, uthese, uthese)) sc_out(ctf_integer(siginfo_t *, uinfo, uinfo)) sc_in(ctf_integer(const struct timespec *, uts, uts)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_pread64
 SC_LTTNG_TRACEPOINT_EVENT(pread64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count, loff_t pos),
        TP_ARGS(sc_exit(ret,) fd, buf, count, pos),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count)) sc_in(__field(loff_t, pos))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(count, count)) sc_in(tp_assign(pos, pos))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)) sc_in(ctf_integer(loff_t, pos, pos)))
 )
 #endif
 #ifndef OVERRIDE_32_pwrite64
 SC_LTTNG_TRACEPOINT_EVENT(pwrite64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count, loff_t pos),
        TP_ARGS(sc_exit(ret,) fd, buf, count, pos),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count)) sc_in(__field(loff_t, pos))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buf, buf)) sc_in(tp_assign(count, count)) sc_in(tp_assign(pos, pos))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(const char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)) sc_in(ctf_integer(loff_t, pos, pos)))
 )
 #endif
 #ifndef OVERRIDE_32_sendfile
 SC_LTTNG_TRACEPOINT_EVENT(sendfile,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, off_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, out_fd)) sc_inout(__field(int, in_fd)) sc_inout(__field_hex(off_t *, offset)) sc_inout(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(out_fd, out_fd)) sc_inout(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_inout(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, out_fd, out_fd)) sc_inout(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(off_t *, offset, offset)) sc_inout(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_getxattr
 SC_LTTNG_TRACEPOINT_EVENT(getxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_lgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lgetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_fgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fgetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) fd, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_sendfile64
 SC_LTTNG_TRACEPOINT_EVENT(sendfile64,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, loff_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, out_fd)) sc_in(__field(int, in_fd)) sc_inout(__field_hex(loff_t *, offset)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(out_fd, out_fd)) sc_in(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, out_fd, out_fd)) sc_in(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(loff_t *, offset, offset)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_ctl
 SC_LTTNG_TRACEPOINT_EVENT(epoll_ctl,
        TP_PROTO(sc_exit(long ret,) int epfd, int op, int fd, struct epoll_event * event),
        TP_ARGS(sc_exit(ret,) epfd, op, fd, event),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_in(__field(int, op)) sc_in(__field(int, fd)) sc_in(__field_hex(struct epoll_event *, event))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_in(tp_assign(op, op)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(event, event))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct epoll_event *, event, event)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_wait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_wait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_settime
 SC_LTTNG_TRACEPOINT_EVENT(timer_settime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, int flags, const struct itimerspec * new_setting, struct itimerspec * old_setting),
        TP_ARGS(sc_exit(ret,) timer_id, flags, new_setting, old_setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, new_setting)) sc_out(__field_hex(struct itimerspec *, old_setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_setting, new_setting)) sc_out(tp_assign(old_setting, old_setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, new_setting, new_setting)) sc_out(ctf_integer(struct itimerspec *, old_setting, old_setting)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(clock_nanosleep,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, int flags, const struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) which_clock, flags, rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_32_openat
 SC_LTTNG_TRACEPOINT_EVENT(openat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_mknodat
 SC_LTTNG_TRACEPOINT_EVENT(mknodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatat64
 SC_LTTNG_TRACEPOINT_EVENT(fstatat64,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct stat64 * statbuf, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, statbuf, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, dfd)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf)) sc_inout(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(dfd, dfd)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf)) sc_inout(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, dfd, dfd)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)) sc_inout(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_renameat
 SC_LTTNG_TRACEPOINT_EVENT(renameat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_readlinkat
 SC_LTTNG_TRACEPOINT_EVENT(readlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) dfd, pathname, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_32_vmsplice
 SC_LTTNG_TRACEPOINT_EVENT(vmsplice,
        TP_PROTO(sc_exit(long ret,) int fd, const struct iovec * iov, unsigned long nr_segs, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, iov, nr_segs, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(const struct iovec *, iov)) sc_in(__field(unsigned long, nr_segs)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(iov, iov)) sc_in(tp_assign(nr_segs, nr_segs)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(const struct iovec *, iov, iov)) sc_in(ctf_integer(unsigned long, nr_segs, nr_segs)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_utimensat
 SC_LTTNG_TRACEPOINT_EVENT(utimensat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timespec * utimes, int flags),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timespec *, utimes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timespec *, utimes, utimes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_settime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_settime,
        TP_PROTO(sc_exit(long ret,) int ufd, int flags, const struct itimerspec * utmr, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, flags, utmr, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, utmr)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(utmr, utmr)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, utmr, utmr)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_32_signalfd4
 SC_LTTNG_TRACEPOINT_EVENT(signalfd4,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask, int flags),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_tgsigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_tgsigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_32_accept4
 SC_LTTNG_TRACEPOINT_EVENT(accept4,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen, int flags),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_prlimit64
 SC_LTTNG_TRACEPOINT_EVENT(prlimit64,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int resource, const struct rlimit64 * new_rlim, struct rlimit64 * old_rlim),
        TP_ARGS(sc_exit(ret,) pid, resource, new_rlim, old_rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(const struct rlimit64 *, new_rlim)) sc_out(__field_hex(struct rlimit64 *, old_rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(new_rlim, new_rlim)) sc_out(tp_assign(old_rlim, old_rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(const struct rlimit64 *, new_rlim, new_rlim)) sc_out(ctf_integer(struct rlimit64 *, old_rlim, old_rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_sendmmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_mount
 SC_LTTNG_TRACEPOINT_EVENT(mount,
        TP_PROTO(sc_exit(long ret,) char * dev_name, char * dir_name, char * type, unsigned long flags, void * data),
        TP_ARGS(sc_exit(ret,) dev_name, dir_name, type, flags, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(dev_name, dev_name)) sc_in(__string_from_user(dir_name, dir_name)) sc_in(__string_from_user(type, type)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(void *, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(dev_name, dev_name)) sc_in(tp_copy_string_from_user(dir_name, dir_name)) sc_in(tp_copy_string_from_user(type, type)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(dev_name, dev_name)) sc_in(ctf_user_string(dir_name, dir_name)) sc_in(ctf_user_string(type, type)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(void *, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_llseek
 SC_LTTNG_TRACEPOINT_EVENT(llseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t * result, unsigned int whence),
        TP_ARGS(sc_exit(ret,) fd, offset_high, offset_low, result, whence),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned long, offset_high)) sc_inout(__field(unsigned long, offset_low)) sc_inout(__field_hex(loff_t *, result)) sc_inout(__field(unsigned int, whence))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset_high, offset_high)) sc_inout(tp_assign(offset_low, offset_low)) sc_inout(tp_assign(result, result)) sc_inout(tp_assign(whence, whence))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned long, offset_high, offset_high)) sc_inout(ctf_integer(unsigned long, offset_low, offset_low)) sc_inout(ctf_integer(loff_t *, result, result)) sc_inout(ctf_integer(unsigned int, whence, whence)))
 )
 #endif
 #ifndef OVERRIDE_32_select
 SC_LTTNG_TRACEPOINT_EVENT(select,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timeval * tvp),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tvp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timeval *, tvp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tvp, tvp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timeval *, tvp, tvp)))
 )
 #endif
 #ifndef OVERRIDE_32_getsockopt
 SC_LTTNG_TRACEPOINT_EVENT(getsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int * optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_out(__field_hex(char *, optval)) sc_inout(__field_hex(int *, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_out(tp_assign(optval, optval)) sc_inout(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_out(ctf_integer(char *, optval, optval)) sc_inout(ctf_integer(int *, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_32_setsockopt
 SC_LTTNG_TRACEPOINT_EVENT(setsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_in(__field_hex(char *, optval)) sc_in(__field(int, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_in(tp_assign(optval, optval)) sc_in(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_in(ctf_integer(char *, optval, optval)) sc_in(ctf_integer(int, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_32_setxattr
 SC_LTTNG_TRACEPOINT_EVENT(setxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_lsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lsetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_fsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fsetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) fd, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_io_getevents
 SC_LTTNG_TRACEPOINT_EVENT(io_getevents,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long min_nr, long nr, struct io_event * events, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) ctx_id, min_nr, nr, events, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, min_nr)) sc_in(__field(long, nr)) sc_out(__field_hex(struct io_event *, events)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(min_nr, min_nr)) sc_in(tp_assign(nr, nr)) sc_out(tp_assign(events, events)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, min_nr, min_nr)) sc_in(ctf_integer(long, nr, nr)) sc_out(ctf_integer(struct io_event *, events, events)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_waitid
 SC_LTTNG_TRACEPOINT_EVENT(waitid,
        TP_PROTO(sc_exit(long ret,) int which, pid_t upid, struct siginfo * infop, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) which, upid, infop, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(struct siginfo *, infop)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(infop, infop)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(struct siginfo *, infop, infop)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_fchownat
 SC_LTTNG_TRACEPOINT_EVENT(fchownat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, uid_t user, gid_t group, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, user, group, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_linkat
 SC_LTTNG_TRACEPOINT_EVENT(linkat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname, int flags),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ppoll
 SC_LTTNG_TRACEPOINT_EVENT(ppoll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, struct timespec * tsp, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) ufds, nfds, tsp, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(tsp, tsp)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_preadv
 SC_LTTNG_TRACEPOINT_EVENT(preadv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_out(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_out(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_32_pwritev
 SC_LTTNG_TRACEPOINT_EVENT(pwritev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_in(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_in(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_32_perf_event_open
 SC_LTTNG_TRACEPOINT_EVENT(perf_event_open,
        TP_PROTO(sc_exit(long ret,) struct perf_event_attr * attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags),
        TP_ARGS(sc_exit(ret,) attr_uptr, pid, cpu, group_fd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct perf_event_attr *, attr_uptr)) sc_in(__field(pid_t, pid)) sc_in(__field(int, cpu)) sc_in(__field(int, group_fd)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(attr_uptr, attr_uptr)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(cpu, cpu)) sc_in(tp_assign(group_fd, group_fd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct perf_event_attr *, attr_uptr, attr_uptr)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, cpu, cpu)) sc_in(ctf_integer(int, group_fd, group_fd)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_recvmmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_name_to_handle_at
 SC_LTTNG_TRACEPOINT_EVENT(name_to_handle_at,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * name, struct file_handle * handle, int * mnt_id, int flag),
        TP_ARGS(sc_exit(ret,) dfd, name, handle, mnt_id, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(name, name)) sc_inout(__field_hex(struct file_handle *, handle)) sc_out(__field_hex(int *, mnt_id)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(name, name)) sc_inout(tp_assign(handle, handle)) sc_out(tp_assign(mnt_id, mnt_id)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(name, name)) sc_inout(ctf_integer(struct file_handle *, handle, handle)) sc_out(ctf_integer(int *, mnt_id, mnt_id)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_ipc
 SC_LTTNG_TRACEPOINT_EVENT(ipc,
        TP_PROTO(sc_exit(long ret,) unsigned int call, int first, unsigned long second, unsigned long third, void * ptr, long fifth),
        TP_ARGS(sc_exit(ret,) call, first, second, third, ptr, fifth),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, call)) sc_inout(__field(int, first)) sc_inout(__field(unsigned long, second)) sc_inout(__field(unsigned long, third)) sc_inout(__field_hex(void *, ptr)) sc_inout(__field(long, fifth))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(call, call)) sc_inout(tp_assign(first, first)) sc_inout(tp_assign(second, second)) sc_inout(tp_assign(third, third)) sc_inout(tp_assign(ptr, ptr)) sc_inout(tp_assign(fifth, fifth))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, call, call)) sc_inout(ctf_integer(int, first, first)) sc_inout(ctf_integer(unsigned long, second, second)) sc_inout(ctf_integer(unsigned long, third, third)) sc_inout(ctf_integer(void *, ptr, ptr)) sc_inout(ctf_integer(long, fifth, fifth)))
 )
 #endif
 #ifndef OVERRIDE_32_recvfrom
 SC_LTTNG_TRACEPOINT_EVENT(recvfrom,
        TP_PROTO(sc_exit(long ret,) int fd, void * ubuf, size_t size, unsigned int flags, struct sockaddr * addr, int * addr_len),
        TP_ARGS(sc_exit(ret,) fd, ubuf, size, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(void *, ubuf)) sc_in(__field(size_t, size)) sc_in(__field(unsigned int, flags)) sc_out(__field_hex(struct sockaddr *, addr)) sc_inout(__field_hex(int *, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(ubuf, ubuf)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags)) sc_out(tp_assign(addr, addr)) sc_inout(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(void *, ubuf, ubuf)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_out(ctf_integer(struct sockaddr *, addr, addr)) sc_inout(ctf_integer(int *, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_sendto
 SC_LTTNG_TRACEPOINT_EVENT(sendto,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned int flags, struct sockaddr * addr, int addr_len),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(void *, buff)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags)) sc_in(__field_hex(struct sockaddr *, addr)) sc_in(__field_hex(int, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buff, buff)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(void *, buff, buff)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_in(ctf_integer(struct sockaddr *, addr, addr)) sc_in(ctf_integer(int, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_futex
 SC_LTTNG_TRACEPOINT_EVENT(futex,
        TP_PROTO(sc_exit(long ret,) u32 * uaddr, int op, u32 val, struct timespec * utime, u32 * uaddr2, u32 val3),
        TP_ARGS(sc_exit(ret,) uaddr, op, val, utime, uaddr2, val3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(u32 *, uaddr)) sc_in(__field(int, op)) sc_in(__field(u32, val)) sc_in(__field_hex(struct timespec *, utime)) sc_inout(__field_hex(u32 *, uaddr2)) sc_in(__field(u32, val3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uaddr, uaddr)) sc_in(tp_assign(op, op)) sc_in(tp_assign(val, val)) sc_in(tp_assign(utime, utime)) sc_inout(tp_assign(uaddr2, uaddr2)) sc_in(tp_assign(val3, val3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(u32 *, uaddr, uaddr)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(u32, val, val)) sc_in(ctf_integer(struct timespec *, utime, utime)) sc_inout(ctf_integer(u32 *, uaddr2, uaddr2)) sc_in(ctf_integer(u32, val3, val3)))
 )
 #endif
 #ifndef OVERRIDE_32_pselect6
 SC_LTTNG_TRACEPOINT_EVENT(pselect6,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timespec * tsp, void * sig),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tsp, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(void *, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tsp, tsp)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(void *, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_splice
 SC_LTTNG_TRACEPOINT_EVENT(splice,
        TP_PROTO(sc_exit(long ret,) int fd_in, loff_t * off_in, int fd_out, loff_t * off_out, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd_in, off_in, fd_out, off_out, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd_in)) sc_in(__field_hex(loff_t *, off_in)) sc_in(__field(int, fd_out)) sc_in(__field_hex(loff_t *, off_out)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd_in, fd_in)) sc_in(tp_assign(off_in, off_in)) sc_in(tp_assign(fd_out, fd_out)) sc_in(tp_assign(off_out, off_out)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd_in, fd_in)) sc_in(ctf_integer(loff_t *, off_in, off_in)) sc_in(ctf_integer(int, fd_out, fd_out)) sc_in(ctf_integer(loff_t *, off_out, off_out)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_pwait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 

diff --git a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h
index 40779cad929bfa68cd756a1356cfdd85b18e1392..e2a66d5fdbba6474c83edd18e0098d66f2ead478 100644 (file)
--- a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h
+++ b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h
@@ -11,9 +11,7 @@
 
 #ifdef SC_ENTER
 SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscalls_noargs,
-       TP_STRUCT__entry(),
-       TP_fast_assign(),
-       TP_printk()
+       TP_FIELDS()
 )
 #ifndef OVERRIDE_64_sgetmask
 SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, sgetmask)
@@ -71,153 +69,119 @@ SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, inotify_init)
 SC_LTTNG_TRACEPOINT_EVENT(sgetmask,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_yield
 SC_LTTNG_TRACEPOINT_EVENT(sched_yield,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_pause
 SC_LTTNG_TRACEPOINT_EVENT(pause,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_getpid
 SC_LTTNG_TRACEPOINT_EVENT(getpid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_getuid
 SC_LTTNG_TRACEPOINT_EVENT(getuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_getgid
 SC_LTTNG_TRACEPOINT_EVENT(getgid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_geteuid
 SC_LTTNG_TRACEPOINT_EVENT(geteuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_getegid
 SC_LTTNG_TRACEPOINT_EVENT(getegid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_getppid
 SC_LTTNG_TRACEPOINT_EVENT(getppid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_getpgrp
 SC_LTTNG_TRACEPOINT_EVENT(getpgrp,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_setsid
 SC_LTTNG_TRACEPOINT_EVENT(setsid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_munlockall
 SC_LTTNG_TRACEPOINT_EVENT(munlockall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_vhangup
 SC_LTTNG_TRACEPOINT_EVENT(vhangup,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_sync
 SC_LTTNG_TRACEPOINT_EVENT(sync,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_gettid
 SC_LTTNG_TRACEPOINT_EVENT(gettid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_restart_syscall
 SC_LTTNG_TRACEPOINT_EVENT(restart_syscall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_64_inotify_init
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #endif /* else #ifdef SC_ENTER */
@@ -225,774 +189,602 @@ SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
 SC_LTTNG_TRACEPOINT_EVENT(nice,
        TP_PROTO(sc_exit(long ret,) int increment),
        TP_ARGS(sc_exit(ret,) increment),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, increment))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(increment, increment))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, increment, increment)))
 )
 #endif
 #ifndef OVERRIDE_64_ssetmask
 SC_LTTNG_TRACEPOINT_EVENT(ssetmask,
        TP_PROTO(sc_exit(long ret,) int newmask),
        TP_ARGS(sc_exit(ret,) newmask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, newmask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(newmask, newmask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, newmask, newmask)))
 )
 #endif
 #ifndef OVERRIDE_64_personality
 SC_LTTNG_TRACEPOINT_EVENT(personality,
        TP_PROTO(sc_exit(long ret,) unsigned int personality),
        TP_ARGS(sc_exit(ret,) personality),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, personality))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(personality, personality))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, personality, personality)))
 )
 #endif
 #ifndef OVERRIDE_64_close
 SC_LTTNG_TRACEPOINT_EVENT(close,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_64_brk
 SC_LTTNG_TRACEPOINT_EVENT(brk,
        TP_PROTO(sc_exit(long ret,) unsigned long brk),
        TP_ARGS(sc_exit(ret,) brk),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, brk))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(brk, brk))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, brk, brk)))
 )
 #endif
 #ifndef OVERRIDE_64_dup
 SC_LTTNG_TRACEPOINT_EVENT(dup,
        TP_PROTO(sc_exit(long ret,) unsigned int fildes),
        TP_ARGS(sc_exit(ret,) fildes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fildes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fildes, fildes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fildes, fildes)))
 )
 #endif
 #ifndef OVERRIDE_64_alarm
 SC_LTTNG_TRACEPOINT_EVENT(alarm,
        TP_PROTO(sc_exit(long ret,) unsigned int seconds),
        TP_ARGS(sc_exit(ret,) seconds),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, seconds))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(seconds, seconds))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, seconds, seconds)))
 )
 #endif
 #ifndef OVERRIDE_64_exit
 SC_LTTNG_TRACEPOINT_EVENT(exit,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_64_fsync
 SC_LTTNG_TRACEPOINT_EVENT(fsync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_64_fdatasync
 SC_LTTNG_TRACEPOINT_EVENT(fdatasync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_64_fchdir
 SC_LTTNG_TRACEPOINT_EVENT(fchdir,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_64_umask
 SC_LTTNG_TRACEPOINT_EVENT(umask,
        TP_PROTO(sc_exit(long ret,) int mask),
        TP_ARGS(sc_exit(ret,) mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_64_setuid
 SC_LTTNG_TRACEPOINT_EVENT(setuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_64_setgid
 SC_LTTNG_TRACEPOINT_EVENT(setgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_64_getpgid
 SC_LTTNG_TRACEPOINT_EVENT(getpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_64_setfsuid
 SC_LTTNG_TRACEPOINT_EVENT(setfsuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_64_setfsgid
 SC_LTTNG_TRACEPOINT_EVENT(setfsgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_64_getsid
 SC_LTTNG_TRACEPOINT_EVENT(getsid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_64_32_personality
 SC_LTTNG_TRACEPOINT_EVENT(32_personality,
        TP_PROTO(sc_exit(long ret,) unsigned long personality),
        TP_ARGS(sc_exit(ret,) personality),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, personality))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(personality, personality))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, personality, personality)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_getscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_getscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_get_priority_max
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_max,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_get_priority_min
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_min,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_64_mlockall
 SC_LTTNG_TRACEPOINT_EVENT(mlockall,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_io_destroy
 SC_LTTNG_TRACEPOINT_EVENT(io_destroy,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx),
        TP_ARGS(sc_exit(ret,) ctx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx, ctx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx, ctx)))
 )
 #endif
 #ifndef OVERRIDE_64_exit_group
 SC_LTTNG_TRACEPOINT_EVENT(exit_group,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_64_epoll_create
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create,
        TP_PROTO(sc_exit(long ret,) int size),
        TP_ARGS(sc_exit(ret,) size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_timer_getoverrun
 SC_LTTNG_TRACEPOINT_EVENT(timer_getoverrun,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_64_timer_delete
 SC_LTTNG_TRACEPOINT_EVENT(timer_delete,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_64_set_thread_area
 SC_LTTNG_TRACEPOINT_EVENT(set_thread_area,
        TP_PROTO(sc_exit(long ret,) unsigned long addr),
        TP_ARGS(sc_exit(ret,) addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)))
 )
 #endif
 #ifndef OVERRIDE_64_unshare
 SC_LTTNG_TRACEPOINT_EVENT(unshare,
        TP_PROTO(sc_exit(long ret,) unsigned long unshare_flags),
        TP_ARGS(sc_exit(ret,) unshare_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, unshare_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unshare_flags, unshare_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, unshare_flags, unshare_flags)))
 )
 #endif
 #ifndef OVERRIDE_64_eventfd
 SC_LTTNG_TRACEPOINT_EVENT(eventfd,
        TP_PROTO(sc_exit(long ret,) unsigned int count),
        TP_ARGS(sc_exit(ret,) count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_epoll_create1
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_inotify_init1
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_syncfs
 SC_LTTNG_TRACEPOINT_EVENT(syncfs,
        TP_PROTO(sc_exit(long ret,) int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_64_bdflush
 SC_LTTNG_TRACEPOINT_EVENT(bdflush,
        TP_PROTO(sc_exit(long ret,) int func, long data),
        TP_ARGS(sc_exit(ret,) func, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, func)) sc_inout(__field(long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(func, func)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, func, func)) sc_inout(ctf_integer(long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_64_munmap
 SC_LTTNG_TRACEPOINT_EVENT(munmap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, size_t len),
        TP_ARGS(sc_exit(ret,) addr, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_dup2
 SC_LTTNG_TRACEPOINT_EVENT(dup2,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd),
        TP_ARGS(sc_exit(ret,) oldfd, newfd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)))
 )
 #endif
 #ifndef OVERRIDE_64_shutdown
 SC_LTTNG_TRACEPOINT_EVENT(shutdown,
        TP_PROTO(sc_exit(long ret,) int fd, int how),
        TP_ARGS(sc_exit(ret,) fd, how),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, how))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(how, how))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, how, how)))
 )
 #endif
 #ifndef OVERRIDE_64_listen
 SC_LTTNG_TRACEPOINT_EVENT(listen,
        TP_PROTO(sc_exit(long ret,) int fd, int backlog),
        TP_ARGS(sc_exit(ret,) fd, backlog),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, backlog))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(backlog, backlog))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, backlog, backlog)))
 )
 #endif
 #ifndef OVERRIDE_64_kill
 SC_LTTNG_TRACEPOINT_EVENT(kill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_64_msgget
 SC_LTTNG_TRACEPOINT_EVENT(msgget,
        TP_PROTO(sc_exit(long ret,) key_t key, int msgflg),
        TP_ARGS(sc_exit(ret,) key, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(key_t, key)) sc_in(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(key, key)) sc_in(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(key_t, key, key)) sc_in(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_64_flock
 SC_LTTNG_TRACEPOINT_EVENT(flock,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd),
        TP_ARGS(sc_exit(ret,) fd, cmd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)))
 )
 #endif
 #ifndef OVERRIDE_64_ftruncate
 SC_LTTNG_TRACEPOINT_EVENT(ftruncate,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long length),
        TP_ARGS(sc_exit(ret,) fd, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_64_fchmod
 SC_LTTNG_TRACEPOINT_EVENT(fchmod,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, umode_t mode),
        TP_ARGS(sc_exit(ret,) fd, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_setpgid
 SC_LTTNG_TRACEPOINT_EVENT(setpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, pid_t pgid),
        TP_ARGS(sc_exit(ret,) pid, pgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(pid_t, pgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(pgid, pgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(pid_t, pgid, pgid)))
 )
 #endif
 #ifndef OVERRIDE_64_setreuid
 SC_LTTNG_TRACEPOINT_EVENT(setreuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid),
        TP_ARGS(sc_exit(ret,) ruid, euid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)))
 )
 #endif
 #ifndef OVERRIDE_64_setregid
 SC_LTTNG_TRACEPOINT_EVENT(setregid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid),
        TP_ARGS(sc_exit(ret,) rgid, egid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)))
 )
 #endif
 #ifndef OVERRIDE_64_getpriority
 SC_LTTNG_TRACEPOINT_EVENT(getpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_64_mlock
 SC_LTTNG_TRACEPOINT_EVENT(mlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_munlock
 SC_LTTNG_TRACEPOINT_EVENT(munlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_tkill
 SC_LTTNG_TRACEPOINT_EVENT(tkill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_64_inotify_rm_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_rm_watch,
        TP_PROTO(sc_exit(long ret,) int fd, __s32 wd),
        TP_ARGS(sc_exit(ret,) fd, wd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(__s32, wd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(wd, wd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(__s32, wd, wd)))
 )
 #endif
 #ifndef OVERRIDE_64_ioprio_get
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_get,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_64_timerfd_create
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_create,
        TP_PROTO(sc_exit(long ret,) int clockid, int flags),
        TP_ARGS(sc_exit(ret,) clockid, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, clockid)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(clockid, clockid)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, clockid, clockid)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_eventfd2
 SC_LTTNG_TRACEPOINT_EVENT(eventfd2,
        TP_PROTO(sc_exit(long ret,) unsigned int count, int flags),
        TP_ARGS(sc_exit(ret,) count, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_setns
 SC_LTTNG_TRACEPOINT_EVENT(setns,
        TP_PROTO(sc_exit(long ret,) int fd, int nstype),
        TP_ARGS(sc_exit(ret,) fd, nstype),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, nstype))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(nstype, nstype))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, nstype, nstype)))
 )
 #endif
 #ifndef OVERRIDE_64_ioctl
 SC_LTTNG_TRACEPOINT_EVENT(ioctl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_64_fcntl
 SC_LTTNG_TRACEPOINT_EVENT(fcntl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_64_lseek
 SC_LTTNG_TRACEPOINT_EVENT(lseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, off_t offset, unsigned int origin),
        TP_ARGS(sc_exit(ret,) fd, offset, origin),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(off_t, offset)) sc_in(__field(unsigned int, origin))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(origin, origin))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(off_t, offset, offset)) sc_in(ctf_integer(unsigned int, origin, origin)))
 )
 #endif
 #ifndef OVERRIDE_64_mprotect
 SC_LTTNG_TRACEPOINT_EVENT(mprotect,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned long prot),
        TP_ARGS(sc_exit(ret,) start, len, prot),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(unsigned long, prot))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(prot, prot))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned long, prot, prot)))
 )
 #endif
 #ifndef OVERRIDE_64_msync
 SC_LTTNG_TRACEPOINT_EVENT(msync,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, int flags),
        TP_ARGS(sc_exit(ret,) start, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_madvise
 SC_LTTNG_TRACEPOINT_EVENT(madvise,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len_in, int behavior),
        TP_ARGS(sc_exit(ret,) start, len_in, behavior),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len_in)) sc_in(__field(int, behavior))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len_in, len_in)) sc_in(tp_assign(behavior, behavior))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len_in, len_in)) sc_in(ctf_integer(int, behavior, behavior)))
 )
 #endif
 #ifndef OVERRIDE_64_shmget
 SC_LTTNG_TRACEPOINT_EVENT(shmget,
        TP_PROTO(sc_exit(long ret,) key_t key, size_t size, int shmflg),
        TP_ARGS(sc_exit(ret,) key, size, shmflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(key_t, key)) sc_in(__field(size_t, size)) sc_in(__field(int, shmflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(key, key)) sc_in(tp_assign(size, size)) sc_in(tp_assign(shmflg, shmflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(key_t, key, key)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, shmflg, shmflg)))
 )
 #endif
 #ifndef OVERRIDE_64_socket
 SC_LTTNG_TRACEPOINT_EVENT(socket,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol),
        TP_ARGS(sc_exit(ret,) family, type, protocol),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)))
 )
 #endif
 #ifndef OVERRIDE_64_semget
 SC_LTTNG_TRACEPOINT_EVENT(semget,
        TP_PROTO(sc_exit(long ret,) key_t key, int nsems, int semflg),
        TP_ARGS(sc_exit(ret,) key, nsems, semflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(key_t, key)) sc_in(__field(int, nsems)) sc_in(__field(int, semflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(key, key)) sc_in(tp_assign(nsems, nsems)) sc_in(tp_assign(semflg, semflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(key_t, key, key)) sc_in(ctf_integer(int, nsems, nsems)) sc_in(ctf_integer(int, semflg, semflg)))
 )
 #endif
 #ifndef OVERRIDE_64_fchown
 SC_LTTNG_TRACEPOINT_EVENT(fchown,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) fd, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_64_setresuid
 SC_LTTNG_TRACEPOINT_EVENT(setresuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid, uid_t suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid)) sc_in(__field(uid_t, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid)) sc_in(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)) sc_in(ctf_integer(uid_t, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_64_setresgid
 SC_LTTNG_TRACEPOINT_EVENT(setresgid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid, gid_t sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid)) sc_in(__field(gid_t, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid)) sc_in(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)) sc_in(ctf_integer(gid_t, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_64_sysfs
 SC_LTTNG_TRACEPOINT_EVENT(sysfs,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg1, unsigned long arg2),
        TP_ARGS(sc_exit(ret,) option, arg1, arg2),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_in(__field(unsigned long, arg1)) sc_in(__field(unsigned long, arg2))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_in(tp_assign(arg1, arg1)) sc_in(tp_assign(arg2, arg2))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_in(ctf_integer(unsigned long, arg1, arg1)) sc_in(ctf_integer(unsigned long, arg2, arg2)))
 )
 #endif
 #ifndef OVERRIDE_64_setpriority
 SC_LTTNG_TRACEPOINT_EVENT(setpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who, int niceval),
        TP_ARGS(sc_exit(ret,) which, who, niceval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, niceval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(niceval, niceval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, niceval, niceval)))
 )
 #endif
 #ifndef OVERRIDE_64_cacheflush
 SC_LTTNG_TRACEPOINT_EVENT(cacheflush,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long bytes, unsigned int cache),
        TP_ARGS(sc_exit(ret,) addr, bytes, cache),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, bytes)) sc_inout(__field(unsigned int, cache))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(bytes, bytes)) sc_inout(tp_assign(cache, cache))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, bytes, bytes)) sc_inout(ctf_integer(unsigned int, cache, cache)))
 )
 #endif
 #ifndef OVERRIDE_64_tgkill
 SC_LTTNG_TRACEPOINT_EVENT(tgkill,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_64_ioprio_set
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_set,
        TP_PROTO(sc_exit(long ret,) int which, int who, int ioprio),
        TP_ARGS(sc_exit(ret,) which, who, ioprio),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, ioprio))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(ioprio, ioprio))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, ioprio, ioprio)))
 )
 #endif
 #ifndef OVERRIDE_64_dup3
 SC_LTTNG_TRACEPOINT_EVENT(dup3,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd, int flags),
        TP_ARGS(sc_exit(ret,) oldfd, newfd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_32_ftruncate64
 SC_LTTNG_TRACEPOINT_EVENT(32_ftruncate64,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, unsigned long __dummy, unsigned long a2, unsigned long a3),
        TP_ARGS(sc_exit(ret,) fd, __dummy, a2, a3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, fd)) sc_inout(__field(unsigned long, __dummy)) sc_inout(__field(unsigned long, a2)) sc_inout(__field(unsigned long, a3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(__dummy, __dummy)) sc_inout(tp_assign(a2, a2)) sc_inout(tp_assign(a3, a3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(unsigned long, __dummy, __dummy)) sc_inout(ctf_integer(unsigned long, a2, a2)) sc_inout(ctf_integer(unsigned long, a3, a3)))
 )
 #endif
 #ifndef OVERRIDE_64_ptrace
 SC_LTTNG_TRACEPOINT_EVENT(ptrace,
        TP_PROTO(sc_exit(long ret,) long request, long pid, unsigned long addr, unsigned long data),
        TP_ARGS(sc_exit(ret,) request, pid, addr, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(long, request)) sc_in(__field(long, pid)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(request, request)) sc_in(tp_assign(pid, pid)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(long, request, request)) sc_in(ctf_integer(long, pid, pid)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_64_n32_semctl
 SC_LTTNG_TRACEPOINT_EVENT(n32_semctl,
        TP_PROTO(sc_exit(long ret,) int semid, int semnum, int cmd, u32 arg),
        TP_ARGS(sc_exit(ret,) semid, semnum, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, semid)) sc_inout(__field(int, semnum)) sc_inout(__field(int, cmd)) sc_inout(__field(u32, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(semid, semid)) sc_inout(tp_assign(semnum, semnum)) sc_inout(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, semid, semid)) sc_inout(ctf_integer(int, semnum, semnum)) sc_inout(ctf_integer(int, cmd, cmd)) sc_inout(ctf_integer(u32, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_64_n32_msgsnd
 SC_LTTNG_TRACEPOINT_EVENT(n32_msgsnd,
        TP_PROTO(sc_exit(long ret,) int msqid, u32 msgp, unsigned int msgsz, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, msqid)) sc_inout(__field(u32, msgp)) sc_inout(__field(unsigned int, msgsz)) sc_inout(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(msqid, msqid)) sc_inout(tp_assign(msgp, msgp)) sc_inout(tp_assign(msgsz, msgsz)) sc_inout(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, msqid, msqid)) sc_inout(ctf_integer(u32, msgp, msgp)) sc_inout(ctf_integer(unsigned int, msgsz, msgsz)) sc_inout(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_64_tee
 SC_LTTNG_TRACEPOINT_EVENT(tee,
        TP_PROTO(sc_exit(long ret,) int fdin, int fdout, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fdin, fdout, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fdin)) sc_in(__field(int, fdout)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fdin, fdin)) sc_in(tp_assign(fdout, fdout)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fdin, fdin)) sc_in(ctf_integer(int, fdout, fdout)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_mremap
 SC_LTTNG_TRACEPOINT_EVENT(mremap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr),
        TP_ARGS(sc_exit(ret,) addr, old_len, new_len, flags, new_addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(unsigned long, old_len)) sc_in(__field(unsigned long, new_len)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(unsigned long, new_addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(old_len, old_len)) sc_in(tp_assign(new_len, new_len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_addr, new_addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(unsigned long, old_len, old_len)) sc_in(ctf_integer(unsigned long, new_len, new_len)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(unsigned long, new_addr, new_addr)))
 )
 #endif
 #ifndef OVERRIDE_64_n32_msgrcv
 SC_LTTNG_TRACEPOINT_EVENT(n32_msgrcv,
        TP_PROTO(sc_exit(long ret,) int msqid, u32 msgp, size_t msgsz, int msgtyp, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgtyp, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, msqid)) sc_inout(__field(u32, msgp)) sc_inout(__field(size_t, msgsz)) sc_inout(__field(int, msgtyp)) sc_inout(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(msqid, msqid)) sc_inout(tp_assign(msgp, msgp)) sc_inout(tp_assign(msgsz, msgsz)) sc_inout(tp_assign(msgtyp, msgtyp)) sc_inout(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, msqid, msqid)) sc_inout(ctf_integer(u32, msgp, msgp)) sc_inout(ctf_integer(size_t, msgsz, msgsz)) sc_inout(ctf_integer(int, msgtyp, msgtyp)) sc_inout(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_64_prctl
 SC_LTTNG_TRACEPOINT_EVENT(prctl,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(sc_exit(ret,) option, arg2, arg3, arg4, arg5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_inout(__field(unsigned long, arg2)) sc_in(__field(unsigned long, arg3)) sc_in(__field(unsigned long, arg4)) sc_in(__field(unsigned long, arg5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_inout(tp_assign(arg2, arg2)) sc_in(tp_assign(arg3, arg3)) sc_in(tp_assign(arg4, arg4)) sc_in(tp_assign(arg5, arg5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_inout(ctf_integer(unsigned long, arg2, arg2)) sc_in(ctf_integer(unsigned long, arg3, arg3)) sc_in(ctf_integer(unsigned long, arg4, arg4)) sc_in(ctf_integer(unsigned long, arg5, arg5)))
 )
 #endif
 #ifndef OVERRIDE_64_remap_file_pages
 SC_LTTNG_TRACEPOINT_EVENT(remap_file_pages,
        TP_PROTO(sc_exit(long ret,) unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long flags),
        TP_ARGS(sc_exit(ret,) start, size, prot, pgoff, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(unsigned long, size)) sc_in(__field(unsigned long, prot)) sc_in(__field(unsigned long, pgoff)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(size, size)) sc_in(tp_assign(prot, prot)) sc_in(tp_assign(pgoff, pgoff)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(unsigned long, size, size)) sc_in(ctf_integer(unsigned long, prot, prot)) sc_in(ctf_integer(unsigned long, pgoff, pgoff)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_32_ipc
 SC_LTTNG_TRACEPOINT_EVENT(32_ipc,
        TP_PROTO(sc_exit(long ret,) u32 call, long first, long second, long third, unsigned long ptr, unsigned long fifth),
        TP_ARGS(sc_exit(ret,) call, first, second, third, ptr, fifth),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(u32, call)) sc_inout(__field(long, first)) sc_inout(__field(long, second)) sc_inout(__field(long, third)) sc_inout(__field_hex(unsigned long, ptr)) sc_inout(__field(unsigned long, fifth))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(call, call)) sc_inout(tp_assign(first, first)) sc_inout(tp_assign(second, second)) sc_inout(tp_assign(third, third)) sc_inout(tp_assign(ptr, ptr)) sc_inout(tp_assign(fifth, fifth))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(u32, call, call)) sc_inout(ctf_integer(long, first, first)) sc_inout(ctf_integer(long, second, second)) sc_inout(ctf_integer(long, third, third)) sc_inout(ctf_integer(unsigned long, ptr, ptr)) sc_inout(ctf_integer(unsigned long, fifth, fifth)))
 )
 #endif
 #ifndef OVERRIDE_64_mips_mmap2
 SC_LTTNG_TRACEPOINT_EVENT(mips_mmap2,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff),
        TP_ARGS(sc_exit(ret,) addr, len, prot, flags, fd, pgoff),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, len)) sc_inout(__field(unsigned long, prot)) sc_inout(__field(unsigned long, flags)) sc_inout(__field(unsigned long, fd)) sc_inout(__field(unsigned long, pgoff))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(prot, prot)) sc_inout(tp_assign(flags, flags)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(pgoff, pgoff))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, len, len)) sc_inout(ctf_integer(unsigned long, prot, prot)) sc_inout(ctf_integer(unsigned long, flags, flags)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(unsigned long, pgoff, pgoff)))
 )
 #endif
 #ifndef OVERRIDE_64_mips_mmap
 SC_LTTNG_TRACEPOINT_EVENT(mips_mmap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, off_t offset),
        TP_ARGS(sc_exit(ret,) addr, len, prot, flags, fd, offset),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, len)) sc_inout(__field(unsigned long, prot)) sc_inout(__field(unsigned long, flags)) sc_inout(__field(unsigned long, fd)) sc_inout(__field(off_t, offset))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(prot, prot)) sc_inout(tp_assign(flags, flags)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset, offset))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, len, len)) sc_inout(ctf_integer(unsigned long, prot, prot)) sc_inout(ctf_integer(unsigned long, flags, flags)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(off_t, offset, offset)))
 )
 #endif
 

diff --git a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h
index 14f2fca4d3be626eb13e225a692c5c868272f4e3..9dd4a456c2f82fd20fff109d2f2e9ffc56e71ced 100644 (file)
--- a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h
+++ b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h
@@ -13,1656 +13,1288 @@
 SC_LTTNG_TRACEPOINT_EVENT(oldumount,
        TP_PROTO(sc_exit(long ret,) char * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_olduname
 SC_LTTNG_TRACEPOINT_EVENT(olduname,
        TP_PROTO(sc_exit(long ret,) struct oldold_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct oldold_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct oldold_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_uselib
 SC_LTTNG_TRACEPOINT_EVENT(uselib,
        TP_PROTO(sc_exit(long ret,) const char * library),
        TP_ARGS(sc_exit(ret,) library),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(const char *, library))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(library, library))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(const char *, library, library)))
 )
 #endif
 #ifndef OVERRIDE_64_uname
 SC_LTTNG_TRACEPOINT_EVENT(uname,
        TP_PROTO(sc_exit(long ret,) struct old_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct old_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct old_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_sysinfo
 SC_LTTNG_TRACEPOINT_EVENT(sysinfo,
        TP_PROTO(sc_exit(long ret,) struct sysinfo * info),
        TP_ARGS(sc_exit(ret,) info),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct sysinfo *, info))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(info, info))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct sysinfo *, info, info)))
 )
 #endif
 #ifndef OVERRIDE_64_times
 SC_LTTNG_TRACEPOINT_EVENT(times,
        TP_PROTO(sc_exit(long ret,) struct tms * tbuf),
        TP_ARGS(sc_exit(ret,) tbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct tms *, tbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tbuf, tbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct tms *, tbuf, tbuf)))
 )
 #endif
 #ifndef OVERRIDE_64_sysctl
 SC_LTTNG_TRACEPOINT_EVENT(sysctl,
        TP_PROTO(sc_exit(long ret,) struct __sysctl_args * args),
        TP_ARGS(sc_exit(ret,) args),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct __sysctl_args *, args))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(args, args))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct __sysctl_args *, args, args)))
 )
 #endif
 #ifndef OVERRIDE_64_adjtimex
 SC_LTTNG_TRACEPOINT_EVENT(adjtimex,
        TP_PROTO(sc_exit(long ret,) struct timex * txc_p),
        TP_ARGS(sc_exit(ret,) txc_p),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct timex *, txc_p))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(txc_p, txc_p))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct timex *, txc_p, txc_p)))
 )
 #endif
 #ifndef OVERRIDE_64_newuname
 SC_LTTNG_TRACEPOINT_EVENT(newuname,
        TP_PROTO(sc_exit(long ret,) struct new_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct new_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct new_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_shmdt
 SC_LTTNG_TRACEPOINT_EVENT(shmdt,
        TP_PROTO(sc_exit(long ret,) char * shmaddr),
        TP_ARGS(sc_exit(ret,) shmaddr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(char *, shmaddr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(shmaddr, shmaddr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(char *, shmaddr, shmaddr)))
 )
 #endif
 #ifndef OVERRIDE_64_chdir
 SC_LTTNG_TRACEPOINT_EVENT(chdir,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_64_rmdir
 SC_LTTNG_TRACEPOINT_EVENT(rmdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_64_unlink
 SC_LTTNG_TRACEPOINT_EVENT(unlink,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_64_chroot
 SC_LTTNG_TRACEPOINT_EVENT(chroot,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_64_swapoff
 SC_LTTNG_TRACEPOINT_EVENT(swapoff,
        TP_PROTO(sc_exit(long ret,) const char * specialfile),
        TP_ARGS(sc_exit(ret,) specialfile),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(specialfile, specialfile))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(specialfile, specialfile)))
 )
 #endif
 #ifndef OVERRIDE_64_set_tid_address
 SC_LTTNG_TRACEPOINT_EVENT(set_tid_address,
        TP_PROTO(sc_exit(long ret,) int * tidptr),
        TP_ARGS(sc_exit(ret,) tidptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(int *, tidptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tidptr, tidptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int *, tidptr, tidptr)))
 )
 #endif
 #ifndef OVERRIDE_64_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(nanosleep,
        TP_PROTO(sc_exit(long ret,) struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_64_getitimer
 SC_LTTNG_TRACEPOINT_EVENT(getitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value),
        TP_ARGS(sc_exit(ret,) which, value),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_out(__field_hex(struct itimerval *, value))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_out(tp_assign(value, value))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_out(ctf_integer(struct itimerval *, value, value)))
 )
 #endif
 #ifndef OVERRIDE_64_gettimeofday
 SC_LTTNG_TRACEPOINT_EVENT(gettimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct timeval *, tv)) sc_out(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tv, tv)) sc_out(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct timeval *, tv, tv)) sc_out(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_64_getrlimit
 SC_LTTNG_TRACEPOINT_EVENT(getrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_out(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_out(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_out(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_64_getrusage
 SC_LTTNG_TRACEPOINT_EVENT(getrusage,
        TP_PROTO(sc_exit(long ret,) int who, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) who, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, who)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(who, who)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, who, who)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_64_rt_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigpending,
        TP_PROTO(sc_exit(long ret,) sigset_t * set, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) set, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(sigset_t *, set)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(set, set)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(sigset_t *, set, set)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_utime
 SC_LTTNG_TRACEPOINT_EVENT(utime,
        TP_PROTO(sc_exit(long ret,) char * filename, struct utimbuf * times),
        TP_ARGS(sc_exit(ret,) filename, times),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct utimbuf *, times))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(times, times))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct utimbuf *, times, times)))
 )
 #endif
 #ifndef OVERRIDE_64_ustat
 SC_LTTNG_TRACEPOINT_EVENT(ustat,
        TP_PROTO(sc_exit(long ret,) unsigned dev, struct ustat * ubuf),
        TP_ARGS(sc_exit(ret,) dev, ubuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, dev)) sc_out(__field_hex(struct ustat *, ubuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dev, dev)) sc_out(tp_assign(ubuf, ubuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, dev, dev)) sc_out(ctf_integer(struct ustat *, ubuf, ubuf)))
 )
 #endif
 #ifndef OVERRIDE_64_statfs
 SC_LTTNG_TRACEPOINT_EVENT(statfs,
        TP_PROTO(sc_exit(long ret,) const char * pathname, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) pathname, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_64_fstatfs
 SC_LTTNG_TRACEPOINT_EVENT(fstatfs,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) fd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_rr_get_interval
 SC_LTTNG_TRACEPOINT_EVENT(sched_rr_get_interval,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct timespec * interval),
        TP_ARGS(sc_exit(ret,) pid, interval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct timespec *, interval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(interval, interval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct timespec *, interval, interval)))
 )
 #endif
 #ifndef OVERRIDE_64_setrlimit
 SC_LTTNG_TRACEPOINT_EVENT(setrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_64_settimeofday
 SC_LTTNG_TRACEPOINT_EVENT(settimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timeval *, tv)) sc_in(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tv, tv)) sc_in(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timeval *, tv, tv)) sc_in(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_64_io_setup
 SC_LTTNG_TRACEPOINT_EVENT(io_setup,
        TP_PROTO(sc_exit(long ret,) unsigned nr_events, aio_context_t * ctxp),
        TP_ARGS(sc_exit(ret,) nr_events, ctxp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, nr_events)) sc_in(__field_hex(aio_context_t *, ctxp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(nr_events, nr_events)) sc_in(tp_assign(ctxp, ctxp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, nr_events, nr_events)) sc_in(ctf_integer(aio_context_t *, ctxp, ctxp)))
 )
 #endif
 #ifndef OVERRIDE_64_timer_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timer_gettime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, struct itimerspec * setting),
        TP_ARGS(sc_exit(ret,) timer_id, setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_out(__field_hex(struct itimerspec *, setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_out(tp_assign(setting, setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_out(ctf_integer(struct itimerspec *, setting, setting)))
 )
 #endif
 #ifndef OVERRIDE_64_clock_settime
 SC_LTTNG_TRACEPOINT_EVENT(clock_settime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, const struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(const struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(const struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_64_clock_gettime
 SC_LTTNG_TRACEPOINT_EVENT(clock_gettime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_64_clock_getres
 SC_LTTNG_TRACEPOINT_EVENT(clock_getres,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_64_utimes
 SC_LTTNG_TRACEPOINT_EVENT(utimes,
        TP_PROTO(sc_exit(long ret,) char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_64_set_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(set_robust_list,
        TP_PROTO(sc_exit(long ret,) struct robust_list_head * head, size_t len),
        TP_ARGS(sc_exit(ret,) head, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct robust_list_head *, head)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(head, head)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct robust_list_head *, head, head)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_timerfd_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_gettime,
        TP_PROTO(sc_exit(long ret,) int ufd, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_64_clock_adjtime
 SC_LTTNG_TRACEPOINT_EVENT(clock_adjtime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timex * utx),
        TP_ARGS(sc_exit(ret,) which_clock, utx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_inout(__field_hex(struct timex *, utx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_inout(tp_assign(utx, utx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_inout(ctf_integer(struct timex *, utx, utx)))
 )
 #endif
 #ifndef OVERRIDE_64_newstat
 SC_LTTNG_TRACEPOINT_EVENT(newstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_64_newfstat
 SC_LTTNG_TRACEPOINT_EVENT(newfstat,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_64_newlstat
 SC_LTTNG_TRACEPOINT_EVENT(newlstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_64_access
 SC_LTTNG_TRACEPOINT_EVENT(access,
        TP_PROTO(sc_exit(long ret,) const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_truncate
 SC_LTTNG_TRACEPOINT_EVENT(truncate,
        TP_PROTO(sc_exit(long ret,) const char * path, long length),
        TP_ARGS(sc_exit(ret,) path, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_in(__field(long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_in(ctf_integer(long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_64_getcwd
 SC_LTTNG_TRACEPOINT_EVENT(getcwd,
        TP_PROTO(sc_exit(long ret,) char * buf, unsigned long size),
        TP_ARGS(sc_exit(ret,) buf, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(char *, buf)) sc_in(__field(unsigned long, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(unsigned long, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_rename
 SC_LTTNG_TRACEPOINT_EVENT(rename,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_64_mkdir
 SC_LTTNG_TRACEPOINT_EVENT(mkdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_creat
 SC_LTTNG_TRACEPOINT_EVENT(creat,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_link
 SC_LTTNG_TRACEPOINT_EVENT(link,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_64_symlink
 SC_LTTNG_TRACEPOINT_EVENT(symlink,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_64_chmod
 SC_LTTNG_TRACEPOINT_EVENT(chmod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_getgroups
 SC_LTTNG_TRACEPOINT_EVENT(getgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_out(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_out(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_out(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_64_setgroups
 SC_LTTNG_TRACEPOINT_EVENT(setgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_in(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_in(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_in(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_64_32_rt_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(32_rt_sigpending,
        TP_PROTO(sc_exit(long ret,) compat_sigset_t * uset, unsigned int sigsetsize),
        TP_ARGS(sc_exit(ret,) uset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(compat_sigset_t *, uset)) sc_inout(__field(unsigned int, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uset, uset)) sc_inout(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(compat_sigset_t *, uset, uset)) sc_inout(ctf_integer(unsigned int, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_setparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_setparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_getparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_getparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_64_32_sched_rr_get_interval
 SC_LTTNG_TRACEPOINT_EVENT(32_sched_rr_get_interval,
        TP_PROTO(sc_exit(long ret,) compat_pid_t pid, struct compat_timespec * interval),
        TP_ARGS(sc_exit(ret,) pid, interval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(compat_pid_t, pid)) sc_inout(__field_hex(struct compat_timespec *, interval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(pid, pid)) sc_inout(tp_assign(interval, interval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(compat_pid_t, pid, pid)) sc_inout(ctf_integer(struct compat_timespec *, interval, interval)))
 )
 #endif
 #ifndef OVERRIDE_64_pivot_root
 SC_LTTNG_TRACEPOINT_EVENT(pivot_root,
        TP_PROTO(sc_exit(long ret,) const char * new_root, const char * put_old),
        TP_ARGS(sc_exit(ret,) new_root, put_old),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(new_root, new_root)) sc_in(__string_from_user(put_old, put_old))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(new_root, new_root)) sc_in(tp_copy_string_from_user(put_old, put_old))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(new_root, new_root)) sc_in(ctf_user_string(put_old, put_old)))
 )
 #endif
 #ifndef OVERRIDE_64_umount
 SC_LTTNG_TRACEPOINT_EVENT(umount,
        TP_PROTO(sc_exit(long ret,) char * name, int flags),
        TP_ARGS(sc_exit(ret,) name, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_swapon
 SC_LTTNG_TRACEPOINT_EVENT(swapon,
        TP_PROTO(sc_exit(long ret,) const char * specialfile, int swap_flags),
        TP_ARGS(sc_exit(ret,) specialfile, swap_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile)) sc_in(__field(int, swap_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(specialfile, specialfile)) sc_in(tp_assign(swap_flags, swap_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(specialfile, specialfile)) sc_in(ctf_integer(int, swap_flags, swap_flags)))
 )
 #endif
 #ifndef OVERRIDE_64_sethostname
 SC_LTTNG_TRACEPOINT_EVENT(sethostname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_setdomainname
 SC_LTTNG_TRACEPOINT_EVENT(setdomainname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_delete_module
 SC_LTTNG_TRACEPOINT_EVENT(delete_module,
        TP_PROTO(sc_exit(long ret,) const char * name_user, unsigned int flags),
        TP_ARGS(sc_exit(ret,) name_user, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name_user, name_user)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name_user, name_user)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name_user, name_user)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_removexattr
 SC_LTTNG_TRACEPOINT_EVENT(removexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_lremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(lremovexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_fremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(fremovexattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name),
        TP_ARGS(sc_exit(ret,) fd, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_64_pipe2
 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(__field_hex(int *, fildes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(fildes, fildes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(int *, fildes, fildes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_waitpid
 SC_LTTNG_TRACEPOINT_EVENT(waitpid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int * stat_addr, int options),
        TP_ARGS(sc_exit(ret,) pid, stat_addr, options),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(pid_t, pid)) sc_inout(__field_hex(int *, stat_addr)) sc_inout(__field(int, options))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(pid, pid)) sc_inout(tp_assign(stat_addr, stat_addr)) sc_inout(tp_assign(options, options))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(pid_t, pid, pid)) sc_inout(ctf_integer(int *, stat_addr, stat_addr)) sc_inout(ctf_integer(int, options, options)))
 )
 #endif
 #ifndef OVERRIDE_64_32_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(32_sigaction,
        TP_PROTO(sc_exit(long ret,) long sig, const struct sigaction32 * act, struct sigaction32 * oact),
        TP_ARGS(sc_exit(ret,) sig, act, oact),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(long, sig)) sc_inout(__field_hex(const struct sigaction32 *, act)) sc_inout(__field_hex(struct sigaction32 *, oact))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(sig, sig)) sc_inout(tp_assign(act, act)) sc_inout(tp_assign(oact, oact))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(long, sig, sig)) sc_inout(ctf_integer(const struct sigaction32 *, act, act)) sc_inout(ctf_integer(struct sigaction32 *, oact, oact)))
 )
 #endif
 #ifndef OVERRIDE_64_readv
 SC_LTTNG_TRACEPOINT_EVENT(readv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_64_writev
 SC_LTTNG_TRACEPOINT_EVENT(writev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_64_shmctl
 SC_LTTNG_TRACEPOINT_EVENT(shmctl,
        TP_PROTO(sc_exit(long ret,) int shmid, int cmd, struct shmid_ds * buf),
        TP_ARGS(sc_exit(ret,) shmid, cmd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, shmid)) sc_in(__field(int, cmd)) sc_inout(__field_hex(struct shmid_ds *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(shmid, shmid)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, shmid, shmid)) sc_in(ctf_integer(int, cmd, cmd)) sc_inout(ctf_integer(struct shmid_ds *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_64_setitimer
 SC_LTTNG_TRACEPOINT_EVENT(setitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value, struct itimerval * ovalue),
        TP_ARGS(sc_exit(ret,) which, value, ovalue),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field_hex(struct itimerval *, value)) sc_out(__field_hex(struct itimerval *, ovalue))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(value, value)) sc_out(tp_assign(ovalue, ovalue))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(struct itimerval *, value, value)) sc_out(ctf_integer(struct itimerval *, ovalue, ovalue)))
 )
 #endif
 #ifndef OVERRIDE_64_sendmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_recvmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_inout(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_msgctl
 SC_LTTNG_TRACEPOINT_EVENT(msgctl,
        TP_PROTO(sc_exit(long ret,) int msqid, int cmd, struct msqid_ds * buf),
        TP_ARGS(sc_exit(ret,) msqid, cmd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_in(__field(int, cmd)) sc_inout(__field_hex(struct msqid_ds *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(msqid, msqid)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, msqid, msqid)) sc_in(ctf_integer(int, cmd, cmd)) sc_inout(ctf_integer(struct msqid_ds *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_64_getdents
 SC_LTTNG_TRACEPOINT_EVENT(getdents,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_rt_sigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_setaffinity
 SC_LTTNG_TRACEPOINT_EVENT(sched_setaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_in(__field_hex(unsigned long *, user_mask_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(len, len)) sc_in(tp_assign(user_mask_ptr, user_mask_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, len, len)) sc_in(ctf_integer(unsigned long *, user_mask_ptr, user_mask_ptr)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_getaffinity
 SC_LTTNG_TRACEPOINT_EVENT(sched_getaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_out(__field_hex(unsigned long *, user_mask_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(len, len)) sc_out(tp_assign(user_mask_ptr, user_mask_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, len, len)) sc_out(ctf_integer(unsigned long *, user_mask_ptr, user_mask_ptr)))
 )
 #endif
 #ifndef OVERRIDE_64_io_submit
 SC_LTTNG_TRACEPOINT_EVENT(io_submit,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long nr, struct iocb * * iocbpp),
        TP_ARGS(sc_exit(ret,) ctx_id, nr, iocbpp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, nr)) sc_in(__field_hex(struct iocb * *, iocbpp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(nr, nr)) sc_in(tp_assign(iocbpp, iocbpp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, nr, nr)) sc_in(ctf_integer(struct iocb * *, iocbpp, iocbpp)))
 )
 #endif
 #ifndef OVERRIDE_64_timer_create
 SC_LTTNG_TRACEPOINT_EVENT(timer_create,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct sigevent * timer_event_spec, timer_t * created_timer_id),
        TP_ARGS(sc_exit(ret,) which_clock, timer_event_spec, created_timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(struct sigevent *, timer_event_spec)) sc_out(__field_hex(timer_t *, created_timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(timer_event_spec, timer_event_spec)) sc_out(tp_assign(created_timer_id, created_timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(struct sigevent *, timer_event_spec, timer_event_spec)) sc_out(ctf_integer(timer_t *, created_timer_id, created_timer_id)))
 )
 #endif
 #ifndef OVERRIDE_64_futimesat
 SC_LTTNG_TRACEPOINT_EVENT(futimesat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_64_get_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(get_robust_list,
        TP_PROTO(sc_exit(long ret,) int pid, struct robust_list_head * * head_ptr, size_t * len_ptr),
        TP_ARGS(sc_exit(ret,) pid, head_ptr, len_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, pid)) sc_out(__field_hex(struct robust_list_head * *, head_ptr)) sc_out(__field_hex(size_t *, len_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(head_ptr, head_ptr)) sc_out(tp_assign(len_ptr, len_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, pid, pid)) sc_out(ctf_integer(struct robust_list_head * *, head_ptr, head_ptr)) sc_out(ctf_integer(size_t *, len_ptr, len_ptr)))
 )
 #endif
 #ifndef OVERRIDE_64_signalfd
 SC_LTTNG_TRACEPOINT_EVENT(signalfd,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)))
 )
 #endif
 #ifndef OVERRIDE_64_read
 SC_LTTNG_TRACEPOINT_EVENT(read,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_write
 SC_LTTNG_TRACEPOINT_EVENT(write,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(const char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_open
 SC_LTTNG_TRACEPOINT_EVENT(open,
        TP_PROTO(sc_exit(long ret,) const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_poll
 SC_LTTNG_TRACEPOINT_EVENT(poll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, int timeout_msecs),
        TP_ARGS(sc_exit(ret,) ufds, nfds, timeout_msecs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field(int, timeout_msecs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(timeout_msecs, timeout_msecs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(int, timeout_msecs, timeout_msecs)))
 )
 #endif
 #ifndef OVERRIDE_64_mincore
 SC_LTTNG_TRACEPOINT_EVENT(mincore,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned char * vec),
        TP_ARGS(sc_exit(ret,) start, len, vec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_out(__field_hex(unsigned char *, vec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_out(tp_assign(vec, vec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_out(ctf_integer(unsigned char *, vec, vec)))
 )
 #endif
 #ifndef OVERRIDE_64_shmat
 SC_LTTNG_TRACEPOINT_EVENT(shmat,
        TP_PROTO(sc_exit(long ret,) int shmid, char * shmaddr, int shmflg),
        TP_ARGS(sc_exit(ret,) shmid, shmaddr, shmflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, shmid)) sc_in(__field_hex(char *, shmaddr)) sc_in(__field(int, shmflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(shmid, shmid)) sc_in(tp_assign(shmaddr, shmaddr)) sc_in(tp_assign(shmflg, shmflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, shmid, shmid)) sc_in(ctf_integer(char *, shmaddr, shmaddr)) sc_in(ctf_integer(int, shmflg, shmflg)))
 )
 #endif
 #ifndef OVERRIDE_64_connect
 SC_LTTNG_TRACEPOINT_EVENT(connect,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, uservaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(uservaddr, uservaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, uservaddr, uservaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_64_accept
 SC_LTTNG_TRACEPOINT_EVENT(accept,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)))
 )
 #endif
 #ifndef OVERRIDE_64_bind
 SC_LTTNG_TRACEPOINT_EVENT(bind,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * umyaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, umyaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, umyaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(umyaddr, umyaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, umyaddr, umyaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_64_getsockname
 SC_LTTNG_TRACEPOINT_EVENT(getsockname,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_64_getpeername
 SC_LTTNG_TRACEPOINT_EVENT(getpeername,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_64_semop
 SC_LTTNG_TRACEPOINT_EVENT(semop,
        TP_PROTO(sc_exit(long ret,) int semid, struct sembuf * tsops, unsigned nsops),
        TP_ARGS(sc_exit(ret,) semid, tsops, nsops),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, semid)) sc_in(__field_hex(struct sembuf *, tsops)) sc_in(__field(unsigned, nsops))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(semid, semid)) sc_in(tp_assign(tsops, tsops)) sc_in(tp_assign(nsops, nsops))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, semid, semid)) sc_in(ctf_integer(struct sembuf *, tsops, tsops)) sc_in(ctf_integer(unsigned, nsops, nsops)))
 )
 #endif
 #ifndef OVERRIDE_64_readlink
 SC_LTTNG_TRACEPOINT_EVENT(readlink,
        TP_PROTO(sc_exit(long ret,) const char * path, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) path, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_64_chown
 SC_LTTNG_TRACEPOINT_EVENT(chown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_64_lchown
 SC_LTTNG_TRACEPOINT_EVENT(lchown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_64_syslog
 SC_LTTNG_TRACEPOINT_EVENT(syslog,
        TP_PROTO(sc_exit(long ret,) int type, char * buf, int len),
        TP_ARGS(sc_exit(ret,) type, buf, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, type)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(type, type)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, type, type)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_64_getresuid
 SC_LTTNG_TRACEPOINT_EVENT(getresuid,
        TP_PROTO(sc_exit(long ret,) uid_t * ruidp, uid_t * euidp, uid_t * suidp),
        TP_ARGS(sc_exit(ret,) ruidp, euidp, suidp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(uid_t *, ruidp)) sc_out(__field_hex(uid_t *, euidp)) sc_out(__field_hex(uid_t *, suidp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(ruidp, ruidp)) sc_out(tp_assign(euidp, euidp)) sc_out(tp_assign(suidp, suidp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(uid_t *, ruidp, ruidp)) sc_out(ctf_integer(uid_t *, euidp, euidp)) sc_out(ctf_integer(uid_t *, suidp, suidp)))
 )
 #endif
 #ifndef OVERRIDE_64_getresgid
 SC_LTTNG_TRACEPOINT_EVENT(getresgid,
        TP_PROTO(sc_exit(long ret,) gid_t * rgidp, gid_t * egidp, gid_t * sgidp),
        TP_ARGS(sc_exit(ret,) rgidp, egidp, sgidp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(gid_t *, rgidp)) sc_out(__field_hex(gid_t *, egidp)) sc_out(__field_hex(gid_t *, sgidp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(rgidp, rgidp)) sc_out(tp_assign(egidp, egidp)) sc_out(tp_assign(sgidp, sgidp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(gid_t *, rgidp, rgidp)) sc_out(ctf_integer(gid_t *, egidp, egidp)) sc_out(ctf_integer(gid_t *, sgidp, sgidp)))
 )
 #endif
 #ifndef OVERRIDE_64_32_rt_sigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(32_rt_sigqueueinfo,
        TP_PROTO(sc_exit(long ret,) int pid, int sig, compat_siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, pid)) sc_inout(__field(int, sig)) sc_inout(__field_hex(compat_siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(pid, pid)) sc_inout(tp_assign(sig, sig)) sc_inout(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, pid, pid)) sc_inout(ctf_integer(int, sig, sig)) sc_inout(ctf_integer(compat_siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_64_mknod
 SC_LTTNG_TRACEPOINT_EVENT(mknod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_64_sched_setscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_setscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int policy, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, policy, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, policy)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(policy, policy)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, policy, policy)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_64_init_module
 SC_LTTNG_TRACEPOINT_EVENT(init_module,
        TP_PROTO(sc_exit(long ret,) void * umod, unsigned long len, const char * uargs),
        TP_ARGS(sc_exit(ret,) umod, len, uargs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(void *, umod)) sc_in(__field(unsigned long, len)) sc_in(__field_hex(const char *, uargs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(umod, umod)) sc_in(tp_assign(len, len)) sc_in(tp_assign(uargs, uargs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(void *, umod, umod)) sc_in(ctf_integer(unsigned long, len, len)) sc_in(ctf_integer(const char *, uargs, uargs)))
 )
 #endif
 #ifndef OVERRIDE_64_listxattr
 SC_LTTNG_TRACEPOINT_EVENT(listxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_llistxattr
 SC_LTTNG_TRACEPOINT_EVENT(llistxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_flistxattr
 SC_LTTNG_TRACEPOINT_EVENT(flistxattr,
        TP_PROTO(sc_exit(long ret,) int fd, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) fd, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_cachectl
 SC_LTTNG_TRACEPOINT_EVENT(cachectl,
        TP_PROTO(sc_exit(long ret,) char * addr, int nbytes, int op),
        TP_ARGS(sc_exit(ret,) addr, nbytes, op),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(char *, addr)) sc_inout(__field(int, nbytes)) sc_inout(__field(int, op))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(nbytes, nbytes)) sc_inout(tp_assign(op, op))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(char *, addr, addr)) sc_inout(ctf_integer(int, nbytes, nbytes)) sc_inout(ctf_integer(int, op, op)))
 )
 #endif
 #ifndef OVERRIDE_64_io_cancel
 SC_LTTNG_TRACEPOINT_EVENT(io_cancel,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, struct iocb * iocb, struct io_event * result),
        TP_ARGS(sc_exit(ret,) ctx_id, iocb, result),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field_hex(struct iocb *, iocb)) sc_out(__field_hex(struct io_event *, result))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(iocb, iocb)) sc_out(tp_assign(result, result))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(struct iocb *, iocb, iocb)) sc_out(ctf_integer(struct io_event *, result, result)))
 )
 #endif
 #ifndef OVERRIDE_64_inotify_add_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_add_watch,
        TP_PROTO(sc_exit(long ret,) int fd, const char * pathname, u32 mask),
        TP_ARGS(sc_exit(ret,) fd, pathname, mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(u32, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(u32, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_64_mkdirat
 SC_LTTNG_TRACEPOINT_EVENT(mkdirat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_unlinkat
 SC_LTTNG_TRACEPOINT_EVENT(unlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, int flag),
        TP_ARGS(sc_exit(ret,) dfd, pathname, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_64_symlinkat
 SC_LTTNG_TRACEPOINT_EVENT(symlinkat,
        TP_PROTO(sc_exit(long ret,) const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_64_fchmodat
 SC_LTTNG_TRACEPOINT_EVENT(fchmodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_faccessat
 SC_LTTNG_TRACEPOINT_EVENT(faccessat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_getcpu
 SC_LTTNG_TRACEPOINT_EVENT(getcpu,
        TP_PROTO(sc_exit(long ret,) unsigned * cpup, unsigned * nodep, struct getcpu_cache * unused),
        TP_ARGS(sc_exit(ret,) cpup, nodep, unused),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(unsigned *, cpup)) sc_out(__field_hex(unsigned *, nodep)) sc_inout(__field_hex(struct getcpu_cache *, unused))),
-       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(unused, unused))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(unsigned *, cpup, cpup)) sc_out(ctf_integer(unsigned *, nodep, nodep)) sc_inout(ctf_integer(struct getcpu_cache *, unused, unused)))
 )
 #endif
 #ifndef OVERRIDE_64_getdents64
 SC_LTTNG_TRACEPOINT_EVENT(getdents64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent64 * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent64 *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent64 *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_send
 SC_LTTNG_TRACEPOINT_EVENT(send,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, fd)) sc_inout(__field_hex(void *, buff)) sc_inout(__field(size_t, len)) sc_inout(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(buff, buff)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(void *, buff, buff)) sc_inout(ctf_integer(size_t, len, len)) sc_inout(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_32_truncate64
 SC_LTTNG_TRACEPOINT_EVENT(32_truncate64,
        TP_PROTO(sc_exit(long ret,) const char * path, unsigned long __dummy, unsigned long a2, unsigned long a3),
        TP_ARGS(sc_exit(ret,) path, __dummy, a2, a3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(path, path)) sc_inout(__field(unsigned long, __dummy)) sc_inout(__field(unsigned long, a2)) sc_inout(__field(unsigned long, a3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(path, path)) sc_inout(tp_assign(__dummy, __dummy)) sc_inout(tp_assign(a2, a2)) sc_inout(tp_assign(a3, a3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(path, path)) sc_inout(ctf_integer(unsigned long, __dummy, __dummy)) sc_inout(ctf_integer(unsigned long, a2, a2)) sc_inout(ctf_integer(unsigned long, a3, a3)))
 )
 #endif
 #ifndef OVERRIDE_64_rt_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction * act, struct sigaction * oact, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) sig, act, oact, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, sig)) sc_in(__field_hex(const struct sigaction *, act)) sc_out(__field_hex(struct sigaction *, oact)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(act, act)) sc_out(tp_assign(oact, oact)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(const struct sigaction *, act, act)) sc_out(ctf_integer(struct sigaction *, oact, oact)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_rt_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, sigset_t * nset, sigset_t * oset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) how, nset, oset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, how)) sc_in(__field_hex(sigset_t *, nset)) sc_out(__field_hex(sigset_t *, oset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(how, how)) sc_in(tp_assign(nset, nset)) sc_out(tp_assign(oset, oset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, how, how)) sc_in(ctf_integer(sigset_t *, nset, nset)) sc_out(ctf_integer(sigset_t *, oset, oset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_wait4
 SC_LTTNG_TRACEPOINT_EVENT(wait4,
        TP_PROTO(sc_exit(long ret,) pid_t upid, int * stat_addr, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) upid, stat_addr, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(int *, stat_addr)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(stat_addr, stat_addr)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(int *, stat_addr, stat_addr)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_64_msgsnd
 SC_LTTNG_TRACEPOINT_EVENT(msgsnd,
        TP_PROTO(sc_exit(long ret,) int msqid, struct msgbuf * msgp, size_t msgsz, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_in(__field_hex(struct msgbuf *, msgp)) sc_in(__field(size_t, msgsz)) sc_in(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(msqid, msqid)) sc_in(tp_assign(msgp, msgp)) sc_in(tp_assign(msgsz, msgsz)) sc_in(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, msqid, msqid)) sc_in(ctf_integer(struct msgbuf *, msgp, msgp)) sc_in(ctf_integer(size_t, msgsz, msgsz)) sc_in(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_64_rt_sigtimedwait
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigtimedwait,
        TP_PROTO(sc_exit(long ret,) const sigset_t * uthese, siginfo_t * uinfo, const struct timespec * uts, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uthese, uinfo, uts, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(const sigset_t *, uthese)) sc_out(__field_hex(siginfo_t *, uinfo)) sc_in(__field_hex(const struct timespec *, uts)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(uthese, uthese)) sc_out(tp_assign(uinfo, uinfo)) sc_in(tp_assign(uts, uts)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(const sigset_t *, uthese, uthese)) sc_out(ctf_integer(siginfo_t *, uinfo, uinfo)) sc_in(ctf_integer(const struct timespec *, uts, uts)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_semtimedop
 SC_LTTNG_TRACEPOINT_EVENT(semtimedop,
        TP_PROTO(sc_exit(long ret,) int semid, struct sembuf * tsops, unsigned nsops, const struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) semid, tsops, nsops, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, semid)) sc_in(__field_hex(struct sembuf *, tsops)) sc_in(__field(unsigned, nsops)) sc_inout(__field_hex(const struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(semid, semid)) sc_in(tp_assign(tsops, tsops)) sc_in(tp_assign(nsops, nsops)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, semid, semid)) sc_in(ctf_integer(struct sembuf *, tsops, tsops)) sc_in(ctf_integer(unsigned, nsops, nsops)) sc_inout(ctf_integer(const struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_64_timer_settime
 SC_LTTNG_TRACEPOINT_EVENT(timer_settime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, int flags, const struct itimerspec * new_setting, struct itimerspec * old_setting),
        TP_ARGS(sc_exit(ret,) timer_id, flags, new_setting, old_setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, new_setting)) sc_out(__field_hex(struct itimerspec *, old_setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_setting, new_setting)) sc_out(tp_assign(old_setting, old_setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, new_setting, new_setting)) sc_out(ctf_integer(struct itimerspec *, old_setting, old_setting)))
 )
 #endif
 #ifndef OVERRIDE_64_clock_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(clock_nanosleep,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, int flags, const struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) which_clock, flags, rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_64_vmsplice
 SC_LTTNG_TRACEPOINT_EVENT(vmsplice,
        TP_PROTO(sc_exit(long ret,) int fd, const struct iovec * iov, unsigned long nr_segs, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, iov, nr_segs, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(const struct iovec *, iov)) sc_in(__field(unsigned long, nr_segs)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(iov, iov)) sc_in(tp_assign(nr_segs, nr_segs)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(const struct iovec *, iov, iov)) sc_in(ctf_integer(unsigned long, nr_segs, nr_segs)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_utimensat
 SC_LTTNG_TRACEPOINT_EVENT(utimensat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timespec * utimes, int flags),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timespec *, utimes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timespec *, utimes, utimes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_timerfd_settime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_settime,
        TP_PROTO(sc_exit(long ret,) int ufd, int flags, const struct itimerspec * utmr, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, flags, utmr, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, utmr)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(utmr, utmr)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, utmr, utmr)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_64_rt_tgsigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_tgsigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_64_sendmmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_32_rt_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(32_rt_sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction32 * act, struct sigaction32 * oact, unsigned int sigsetsize),
        TP_ARGS(sc_exit(ret,) sig, act, oact, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, sig)) sc_inout(__field_hex(const struct sigaction32 *, act)) sc_inout(__field_hex(struct sigaction32 *, oact)) sc_inout(__field(unsigned int, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(sig, sig)) sc_inout(tp_assign(act, act)) sc_inout(tp_assign(oact, oact)) sc_inout(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, sig, sig)) sc_inout(ctf_integer(const struct sigaction32 *, act, act)) sc_inout(ctf_integer(struct sigaction32 *, oact, oact)) sc_inout(ctf_integer(unsigned int, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_32_rt_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(32_rt_sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, compat_sigset_t * set, compat_sigset_t * oset, unsigned int sigsetsize),
        TP_ARGS(sc_exit(ret,) how, set, oset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, how)) sc_inout(__field_hex(compat_sigset_t *, set)) sc_inout(__field_hex(compat_sigset_t *, oset)) sc_inout(__field(unsigned int, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(how, how)) sc_inout(tp_assign(set, set)) sc_inout(tp_assign(oset, oset)) sc_inout(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, how, how)) sc_inout(ctf_integer(compat_sigset_t *, set, set)) sc_inout(ctf_integer(compat_sigset_t *, oset, oset)) sc_inout(ctf_integer(unsigned int, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_32_sendfile
 SC_LTTNG_TRACEPOINT_EVENT(32_sendfile,
        TP_PROTO(sc_exit(long ret,) long out_fd, long in_fd, compat_off_t * offset, s32 count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(long, out_fd)) sc_inout(__field(long, in_fd)) sc_inout(__field_hex(compat_off_t *, offset)) sc_inout(__field(s32, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(out_fd, out_fd)) sc_inout(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_inout(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(long, out_fd, out_fd)) sc_inout(ctf_integer(long, in_fd, in_fd)) sc_inout(ctf_integer(compat_off_t *, offset, offset)) sc_inout(ctf_integer(s32, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_socketpair
 SC_LTTNG_TRACEPOINT_EVENT(socketpair,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol, int * usockvec),
        TP_ARGS(sc_exit(ret,) family, type, protocol, usockvec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol)) sc_out(__field_hex(int *, usockvec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol)) sc_out(tp_assign(usockvec, usockvec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)) sc_out(ctf_integer(int *, usockvec, usockvec)))
 )
 #endif
 #ifndef OVERRIDE_64_reboot
 SC_LTTNG_TRACEPOINT_EVENT(reboot,
        TP_PROTO(sc_exit(long ret,) int magic1, int magic2, unsigned int cmd, void * arg),
        TP_ARGS(sc_exit(ret,) magic1, magic2, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, magic1)) sc_in(__field(int, magic2)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(void *, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(magic1, magic1)) sc_in(tp_assign(magic2, magic2)) sc_in(tp_assign(cmd, cmd)) sc_in(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, magic1, magic1)) sc_in(ctf_integer(int, magic2, magic2)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_in(ctf_integer(void *, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_64_quotactl
 SC_LTTNG_TRACEPOINT_EVENT(quotactl,
        TP_PROTO(sc_exit(long ret,) unsigned int cmd, const char * special, qid_t id, void * addr),
        TP_ARGS(sc_exit(ret,) cmd, special, id, addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(const char *, special)) sc_in(__field(qid_t, id)) sc_inout(__field_hex(void *, addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(cmd, cmd)) sc_in(tp_assign(special, special)) sc_in(tp_assign(id, id)) sc_inout(tp_assign(addr, addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_in(ctf_integer(const char *, special, special)) sc_in(ctf_integer(qid_t, id, id)) sc_inout(ctf_integer(void *, addr, addr)))
 )
 #endif
 #ifndef OVERRIDE_64_getxattr
 SC_LTTNG_TRACEPOINT_EVENT(getxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_lgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lgetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_fgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fgetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) fd, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_64_epoll_ctl
 SC_LTTNG_TRACEPOINT_EVENT(epoll_ctl,
        TP_PROTO(sc_exit(long ret,) int epfd, int op, int fd, struct epoll_event * event),
        TP_ARGS(sc_exit(ret,) epfd, op, fd, event),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_in(__field(int, op)) sc_in(__field(int, fd)) sc_in(__field_hex(struct epoll_event *, event))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_in(tp_assign(op, op)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(event, event))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct epoll_event *, event, event)))
 )
 #endif
 #ifndef OVERRIDE_64_epoll_wait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_wait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_64_sendfile64
 SC_LTTNG_TRACEPOINT_EVENT(sendfile64,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, loff_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, out_fd)) sc_in(__field(int, in_fd)) sc_inout(__field_hex(loff_t *, offset)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(out_fd, out_fd)) sc_in(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, out_fd, out_fd)) sc_in(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(loff_t *, offset, offset)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_64_openat
 SC_LTTNG_TRACEPOINT_EVENT(openat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(umode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_64_mknodat
 SC_LTTNG_TRACEPOINT_EVENT(mknodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(umode_t, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_64_newfstatat
 SC_LTTNG_TRACEPOINT_EVENT(newfstatat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct stat * statbuf, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, statbuf, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_64_renameat
 SC_LTTNG_TRACEPOINT_EVENT(renameat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_64_readlinkat
 SC_LTTNG_TRACEPOINT_EVENT(readlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) dfd, pathname, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_64_signalfd4
 SC_LTTNG_TRACEPOINT_EVENT(signalfd4,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask, int flags),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_accept4
 SC_LTTNG_TRACEPOINT_EVENT(accept4,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen, int flags),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_prlimit64
 SC_LTTNG_TRACEPOINT_EVENT(prlimit64,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int resource, const struct rlimit64 * new_rlim, struct rlimit64 * old_rlim),
        TP_ARGS(sc_exit(ret,) pid, resource, new_rlim, old_rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(const struct rlimit64 *, new_rlim)) sc_out(__field_hex(struct rlimit64 *, old_rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(new_rlim, new_rlim)) sc_out(tp_assign(old_rlim, old_rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(const struct rlimit64 *, new_rlim, new_rlim)) sc_out(ctf_integer(struct rlimit64 *, old_rlim, old_rlim)))
 )
 #endif
 #ifndef OVERRIDE_64_32_llseek
 SC_LTTNG_TRACEPOINT_EVENT(32_llseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int offset_high, unsigned int offset_low, loff_t * result, unsigned int origin),
        TP_ARGS(sc_exit(ret,) fd, offset_high, offset_low, result, origin),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned int, offset_high)) sc_inout(__field(unsigned int, offset_low)) sc_inout(__field_hex(loff_t *, result)) sc_inout(__field(unsigned int, origin))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset_high, offset_high)) sc_inout(tp_assign(offset_low, offset_low)) sc_inout(tp_assign(result, result)) sc_inout(tp_assign(origin, origin))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned int, offset_high, offset_high)) sc_inout(ctf_integer(unsigned int, offset_low, offset_low)) sc_inout(ctf_integer(loff_t *, result, result)) sc_inout(ctf_integer(unsigned int, origin, origin)))
 )
 #endif
 #ifndef OVERRIDE_64_32_waitid
 SC_LTTNG_TRACEPOINT_EVENT(32_waitid,
        TP_PROTO(sc_exit(long ret,) int which, compat_pid_t pid, compat_siginfo_t * uinfo, int options, struct compat_rusage * uru),
        TP_ARGS(sc_exit(ret,) which, pid, uinfo, options, uru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, which)) sc_inout(__field(compat_pid_t, pid)) sc_inout(__field_hex(compat_siginfo_t *, uinfo)) sc_inout(__field(int, options)) sc_inout(__field_hex(struct compat_rusage *, uru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(which, which)) sc_inout(tp_assign(pid, pid)) sc_inout(tp_assign(uinfo, uinfo)) sc_inout(tp_assign(options, options)) sc_inout(tp_assign(uru, uru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, which, which)) sc_inout(ctf_integer(compat_pid_t, pid, pid)) sc_inout(ctf_integer(compat_siginfo_t *, uinfo, uinfo)) sc_inout(ctf_integer(int, options, options)) sc_inout(ctf_integer(struct compat_rusage *, uru, uru)))
 )
 #endif
 #ifndef OVERRIDE_64_select
 SC_LTTNG_TRACEPOINT_EVENT(select,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timeval * tvp),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tvp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timeval *, tvp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tvp, tvp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timeval *, tvp, tvp)))
 )
 #endif
 #ifndef OVERRIDE_64_setsockopt
 SC_LTTNG_TRACEPOINT_EVENT(setsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_in(__field_hex(char *, optval)) sc_in(__field(int, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_in(tp_assign(optval, optval)) sc_in(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_in(ctf_integer(char *, optval, optval)) sc_in(ctf_integer(int, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_64_msgrcv
 SC_LTTNG_TRACEPOINT_EVENT(msgrcv,
        TP_PROTO(sc_exit(long ret,) int msqid, struct msgbuf * msgp, size_t msgsz, long msgtyp, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgtyp, msgflg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_out(__field_hex(struct msgbuf *, msgp)) sc_in(__field(size_t, msgsz)) sc_in(__field(long, msgtyp)) sc_in(__field(int, msgflg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(msqid, msqid)) sc_out(tp_assign(msgp, msgp)) sc_in(tp_assign(msgsz, msgsz)) sc_in(tp_assign(msgtyp, msgtyp)) sc_in(tp_assign(msgflg, msgflg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, msqid, msqid)) sc_out(ctf_integer(struct msgbuf *, msgp, msgp)) sc_in(ctf_integer(size_t, msgsz, msgsz)) sc_in(ctf_integer(long, msgtyp, msgtyp)) sc_in(ctf_integer(int, msgflg, msgflg)))
 )
 #endif
 #ifndef OVERRIDE_64_mount
 SC_LTTNG_TRACEPOINT_EVENT(mount,
        TP_PROTO(sc_exit(long ret,) char * dev_name, char * dir_name, char * type, unsigned long flags, void * data),
        TP_ARGS(sc_exit(ret,) dev_name, dir_name, type, flags, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(dev_name, dev_name)) sc_in(__string_from_user(dir_name, dir_name)) sc_in(__string_from_user(type, type)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(void *, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(dev_name, dev_name)) sc_in(tp_copy_string_from_user(dir_name, dir_name)) sc_in(tp_copy_string_from_user(type, type)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(dev_name, dev_name)) sc_in(ctf_user_string(dir_name, dir_name)) sc_in(ctf_user_string(type, type)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(void *, data, data)))
 )
 #endif
 #ifndef OVERRIDE_64_io_getevents
 SC_LTTNG_TRACEPOINT_EVENT(io_getevents,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long min_nr, long nr, struct io_event * events, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) ctx_id, min_nr, nr, events, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, min_nr)) sc_in(__field(long, nr)) sc_out(__field_hex(struct io_event *, events)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(min_nr, min_nr)) sc_in(tp_assign(nr, nr)) sc_out(tp_assign(events, events)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, min_nr, min_nr)) sc_in(ctf_integer(long, nr, nr)) sc_out(ctf_integer(struct io_event *, events, events)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_64_waitid
 SC_LTTNG_TRACEPOINT_EVENT(waitid,
        TP_PROTO(sc_exit(long ret,) int which, pid_t upid, struct siginfo * infop, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) which, upid, infop, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(struct siginfo *, infop)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(infop, infop)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(struct siginfo *, infop, infop)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_64_ppoll
 SC_LTTNG_TRACEPOINT_EVENT(ppoll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, struct timespec * tsp, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) ufds, nfds, tsp, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(tsp, tsp)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_recvmmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_64_getsockopt
 SC_LTTNG_TRACEPOINT_EVENT(getsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int * optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_out(__field_hex(char *, optval)) sc_inout(__field_hex(int *, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_out(tp_assign(optval, optval)) sc_inout(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_out(ctf_integer(char *, optval, optval)) sc_inout(ctf_integer(int *, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_64_setxattr
 SC_LTTNG_TRACEPOINT_EVENT(setxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_lsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lsetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_fsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fsetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) fd, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_fchownat
 SC_LTTNG_TRACEPOINT_EVENT(fchownat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, uid_t user, gid_t group, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, user, group, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_64_linkat
 SC_LTTNG_TRACEPOINT_EVENT(linkat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname, int flags),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_preadv
 SC_LTTNG_TRACEPOINT_EVENT(preadv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_out(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_out(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_64_pwritev
 SC_LTTNG_TRACEPOINT_EVENT(pwritev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_in(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_in(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_64_32_pread
 SC_LTTNG_TRACEPOINT_EVENT(32_pread,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, char * buf, size_t count, unsigned long unused, unsigned long a4, unsigned long a5),
        TP_ARGS(sc_exit(ret,) fd, buf, count, unused, a4, a5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, fd)) sc_inout(__field_hex(char *, buf)) sc_inout(__field(size_t, count)) sc_inout(__field(unsigned long, unused)) sc_inout(__field(unsigned long, a4)) sc_inout(__field(unsigned long, a5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(buf, buf)) sc_inout(tp_assign(count, count)) sc_inout(tp_assign(unused, unused)) sc_inout(tp_assign(a4, a4)) sc_inout(tp_assign(a5, a5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(char *, buf, buf)) sc_inout(ctf_integer(size_t, count, count)) sc_inout(ctf_integer(unsigned long, unused, unused)) sc_inout(ctf_integer(unsigned long, a4, a4)) sc_inout(ctf_integer(unsigned long, a5, a5)))
 )
 #endif
 #ifndef OVERRIDE_64_32_pwrite
 SC_LTTNG_TRACEPOINT_EVENT(32_pwrite,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count, u32 unused, u64 a4, u64 a5),
        TP_ARGS(sc_exit(ret,) fd, buf, count, unused, a4, a5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field_hex(const char *, buf)) sc_inout(__field(size_t, count)) sc_inout(__field(u32, unused)) sc_inout(__field(u64, a4)) sc_inout(__field(u64, a5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(buf, buf)) sc_inout(tp_assign(count, count)) sc_inout(tp_assign(unused, unused)) sc_inout(tp_assign(a4, a4)) sc_inout(tp_assign(a5, a5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(const char *, buf, buf)) sc_inout(ctf_integer(size_t, count, count)) sc_inout(ctf_integer(u32, unused, unused)) sc_inout(ctf_integer(u64, a4, a4)) sc_inout(ctf_integer(u64, a5, a5)))
 )
 #endif
 #ifndef OVERRIDE_64_32_fanotify_mark
 SC_LTTNG_TRACEPOINT_EVENT(32_fanotify_mark,
        TP_PROTO(sc_exit(long ret,) int fanotify_fd, unsigned int flags, u64 a3, u64 a4, int dfd, const char * pathname),
        TP_ARGS(sc_exit(ret,) fanotify_fd, flags, a3, a4, dfd, pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, fanotify_fd)) sc_inout(__field(unsigned int, flags)) sc_inout(__field(u64, a3)) sc_inout(__field(u64, a4)) sc_inout(__field(int, dfd)) sc_inout(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fanotify_fd, fanotify_fd)) sc_inout(tp_assign(flags, flags)) sc_inout(tp_assign(a3, a3)) sc_inout(tp_assign(a4, a4)) sc_inout(tp_assign(dfd, dfd)) sc_inout(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, fanotify_fd, fanotify_fd)) sc_inout(ctf_integer(unsigned int, flags, flags)) sc_inout(ctf_integer(u64, a3, a3)) sc_inout(ctf_integer(u64, a4, a4)) sc_inout(ctf_integer(int, dfd, dfd)) sc_inout(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_64_recvfrom
 SC_LTTNG_TRACEPOINT_EVENT(recvfrom,
        TP_PROTO(sc_exit(long ret,) int fd, void * ubuf, size_t size, unsigned int flags, struct sockaddr * addr, int * addr_len),
        TP_ARGS(sc_exit(ret,) fd, ubuf, size, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(void *, ubuf)) sc_in(__field(size_t, size)) sc_in(__field(unsigned int, flags)) sc_out(__field_hex(struct sockaddr *, addr)) sc_inout(__field_hex(int *, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(ubuf, ubuf)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags)) sc_out(tp_assign(addr, addr)) sc_inout(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(void *, ubuf, ubuf)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_out(ctf_integer(struct sockaddr *, addr, addr)) sc_inout(ctf_integer(int *, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_64_futex
 SC_LTTNG_TRACEPOINT_EVENT(futex,
        TP_PROTO(sc_exit(long ret,) u32 * uaddr, int op, u32 val, struct timespec * utime, u32 * uaddr2, u32 val3),
        TP_ARGS(sc_exit(ret,) uaddr, op, val, utime, uaddr2, val3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(u32 *, uaddr)) sc_in(__field(int, op)) sc_in(__field(u32, val)) sc_in(__field_hex(struct timespec *, utime)) sc_inout(__field_hex(u32 *, uaddr2)) sc_in(__field(u32, val3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uaddr, uaddr)) sc_in(tp_assign(op, op)) sc_in(tp_assign(val, val)) sc_in(tp_assign(utime, utime)) sc_inout(tp_assign(uaddr2, uaddr2)) sc_in(tp_assign(val3, val3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(u32 *, uaddr, uaddr)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(u32, val, val)) sc_in(ctf_integer(struct timespec *, utime, utime)) sc_inout(ctf_integer(u32 *, uaddr2, uaddr2)) sc_in(ctf_integer(u32, val3, val3)))
 )
 #endif
 #ifndef OVERRIDE_64_pselect6
 SC_LTTNG_TRACEPOINT_EVENT(pselect6,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timespec * tsp, void * sig),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tsp, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(void *, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tsp, tsp)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(void *, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_64_epoll_pwait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_64_process_vm_readv
 SC_LTTNG_TRACEPOINT_EVENT(process_vm_readv,
        TP_PROTO(sc_exit(long ret,) pid_t pid, const struct iovec * lvec, unsigned long liovcnt, const struct iovec * rvec, unsigned long riovcnt, unsigned long flags),
        TP_ARGS(sc_exit(ret,) pid, lvec, liovcnt, rvec, riovcnt, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(const struct iovec *, lvec)) sc_in(__field(unsigned long, liovcnt)) sc_in(__field_hex(const struct iovec *, rvec)) sc_in(__field(unsigned long, riovcnt)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(lvec, lvec)) sc_in(tp_assign(liovcnt, liovcnt)) sc_in(tp_assign(rvec, rvec)) sc_in(tp_assign(riovcnt, riovcnt)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(const struct iovec *, lvec, lvec)) sc_in(ctf_integer(unsigned long, liovcnt, liovcnt)) sc_in(ctf_integer(const struct iovec *, rvec, rvec)) sc_in(ctf_integer(unsigned long, riovcnt, riovcnt)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_process_vm_writev
 SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev,
        TP_PROTO(sc_exit(long ret,) pid_t pid, const struct iovec * lvec, unsigned long liovcnt, const struct iovec * rvec, unsigned long riovcnt, unsigned long flags),
        TP_ARGS(sc_exit(ret,) pid, lvec, liovcnt, rvec, riovcnt, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(const struct iovec *, lvec)) sc_in(__field(unsigned long, liovcnt)) sc_in(__field_hex(const struct iovec *, rvec)) sc_in(__field(unsigned long, riovcnt)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(lvec, lvec)) sc_in(tp_assign(liovcnt, liovcnt)) sc_in(tp_assign(rvec, rvec)) sc_in(tp_assign(riovcnt, riovcnt)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(const struct iovec *, lvec, lvec)) sc_in(ctf_integer(unsigned long, liovcnt, liovcnt)) sc_in(ctf_integer(const struct iovec *, rvec, rvec)) sc_in(ctf_integer(unsigned long, riovcnt, riovcnt)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_64_sendto
 SC_LTTNG_TRACEPOINT_EVENT(sendto,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned int flags, struct sockaddr * addr, int addr_len),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(void *, buff)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags)) sc_in(__field_hex(struct sockaddr *, addr)) sc_in(__field_hex(int, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buff, buff)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(void *, buff, buff)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_in(ctf_integer(struct sockaddr *, addr, addr)) sc_in(ctf_integer(int, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_64_32_futex
 SC_LTTNG_TRACEPOINT_EVENT(32_futex,
        TP_PROTO(sc_exit(long ret,) u32 * uaddr, int op, u32 val, struct compat_timespec * utime, u32 * uaddr2, u32 val3),
        TP_ARGS(sc_exit(ret,) uaddr, op, val, utime, uaddr2, val3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(u32 *, uaddr)) sc_inout(__field(int, op)) sc_inout(__field(u32, val)) sc_inout(__field_hex(struct compat_timespec *, utime)) sc_inout(__field_hex(u32 *, uaddr2)) sc_inout(__field(u32, val3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uaddr, uaddr)) sc_inout(tp_assign(op, op)) sc_inout(tp_assign(val, val)) sc_inout(tp_assign(utime, utime)) sc_inout(tp_assign(uaddr2, uaddr2)) sc_inout(tp_assign(val3, val3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(u32 *, uaddr, uaddr)) sc_inout(ctf_integer(int, op, op)) sc_inout(ctf_integer(u32, val, val)) sc_inout(ctf_integer(struct compat_timespec *, utime, utime)) sc_inout(ctf_integer(u32 *, uaddr2, uaddr2)) sc_inout(ctf_integer(u32, val3, val3)))
 )
 #endif
 #ifndef OVERRIDE_64_splice
 SC_LTTNG_TRACEPOINT_EVENT(splice,
        TP_PROTO(sc_exit(long ret,) int fd_in, loff_t * off_in, int fd_out, loff_t * off_out, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd_in, off_in, fd_out, off_out, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd_in)) sc_in(__field_hex(loff_t *, off_in)) sc_in(__field(int, fd_out)) sc_in(__field_hex(loff_t *, off_out)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd_in, fd_in)) sc_in(tp_assign(off_in, off_in)) sc_in(tp_assign(fd_out, fd_out)) sc_in(tp_assign(off_out, off_out)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd_in, fd_in)) sc_in(ctf_integer(loff_t *, off_in, off_in)) sc_in(ctf_integer(int, fd_out, fd_out)) sc_in(ctf_integer(loff_t *, off_out, off_out)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 

diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h
index 90035604d89be8d643c6f6c65761d1f7695cecbe..4c28e46da789587bd614ecf2219246d558b1d53e 100644 (file)
--- a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h
+++ b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h
@@ -11,9 +11,7 @@
 
 #ifdef SC_ENTER
 SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscalls_noargs,
-       TP_STRUCT__entry(),
-       TP_fast_assign(),
-       TP_printk()
+       TP_FIELDS()
 )
 #ifndef OVERRIDE_32_restart_syscall
 SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, restart_syscall)
@@ -71,153 +69,119 @@ SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, inotify_init)
 SC_LTTNG_TRACEPOINT_EVENT(restart_syscall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif                                                                                                                                                                                                           
 #ifndef OVERRIDE_32_getpid
 SC_LTTNG_TRACEPOINT_EVENT(getpid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif                                                                                                                                                                                                                                                                        
 #ifndef OVERRIDE_32_getuid
 SC_LTTNG_TRACEPOINT_EVENT(getuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif                                                                                                                                                                                                                                                                        
 #ifndef OVERRIDE_32_pause
 SC_LTTNG_TRACEPOINT_EVENT(pause,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif                                                                                                                                                                                                                                                                         
 #ifndef OVERRIDE_32_sync
 SC_LTTNG_TRACEPOINT_EVENT(sync,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getgid
 SC_LTTNG_TRACEPOINT_EVENT(getgid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_geteuid
 SC_LTTNG_TRACEPOINT_EVENT(geteuid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getegid
 SC_LTTNG_TRACEPOINT_EVENT(getegid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getppid
 SC_LTTNG_TRACEPOINT_EVENT(getppid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_getpgrp
 SC_LTTNG_TRACEPOINT_EVENT(getpgrp,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_setsid
 SC_LTTNG_TRACEPOINT_EVENT(setsid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sgetmask
 SC_LTTNG_TRACEPOINT_EVENT(sgetmask,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_vhangup
 SC_LTTNG_TRACEPOINT_EVENT(vhangup,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_munlockall
 SC_LTTNG_TRACEPOINT_EVENT(munlockall,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_yield
 SC_LTTNG_TRACEPOINT_EVENT(sched_yield,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_gettid
 SC_LTTNG_TRACEPOINT_EVENT(gettid,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_init
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
        TP_PROTO(sc_exit(long ret)),
        TP_ARGS(sc_exit(ret)),
-       TP_STRUCT__entry(sc_exit(__field(long, ret))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))
 )
 #endif
 #endif /* else #ifdef SC_ENTER */
@@ -225,684 +189,532 @@ SC_LTTNG_TRACEPOINT_EVENT(inotify_init,
 SC_LTTNG_TRACEPOINT_EVENT(exit,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif                                                                                                                                                                                                         
 #ifndef OVERRIDE_32_close
 SC_LTTNG_TRACEPOINT_EVENT(close,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif                                                                                                                                                                                                                                                            
 #ifndef OVERRIDE_32_setuid
 SC_LTTNG_TRACEPOINT_EVENT(setuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif                                                                                                                                                                                                                                                                
 #ifndef OVERRIDE_32_alarm
 SC_LTTNG_TRACEPOINT_EVENT(alarm,
        TP_PROTO(sc_exit(long ret,) unsigned int seconds),
        TP_ARGS(sc_exit(ret,) seconds),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, seconds))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(seconds, seconds))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, seconds, seconds)))
 )
 #endif                                                                                                                                                                                                                                                      
 #ifndef OVERRIDE_32_nice
 SC_LTTNG_TRACEPOINT_EVENT(nice,
        TP_PROTO(sc_exit(long ret,) int increment),
        TP_ARGS(sc_exit(ret,) increment),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, increment))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(increment, increment))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, increment, increment)))
 )
 #endif
 #ifndef OVERRIDE_32_dup
 SC_LTTNG_TRACEPOINT_EVENT(dup,
        TP_PROTO(sc_exit(long ret,) unsigned int fildes),
        TP_ARGS(sc_exit(ret,) fildes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fildes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fildes, fildes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fildes, fildes)))
 )
 #endif
 #ifndef OVERRIDE_32_brk
 SC_LTTNG_TRACEPOINT_EVENT(brk,
        TP_PROTO(sc_exit(long ret,) unsigned long brk),
        TP_ARGS(sc_exit(ret,) brk),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, brk))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(brk, brk))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, brk, brk)))
 )
 #endif
 #ifndef OVERRIDE_32_setgid
 SC_LTTNG_TRACEPOINT_EVENT(setgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_umask
 SC_LTTNG_TRACEPOINT_EVENT(umask,
        TP_PROTO(sc_exit(long ret,) int mask),
        TP_ARGS(sc_exit(ret,) mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_32_ssetmask
 SC_LTTNG_TRACEPOINT_EVENT(ssetmask,
        TP_PROTO(sc_exit(long ret,) int newmask),
        TP_ARGS(sc_exit(ret,) newmask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, newmask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(newmask, newmask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, newmask, newmask)))
 )
 #endif
 #ifndef OVERRIDE_32_fsync
 SC_LTTNG_TRACEPOINT_EVENT(fsync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_getpgid
 SC_LTTNG_TRACEPOINT_EVENT(getpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_fchdir
 SC_LTTNG_TRACEPOINT_EVENT(fchdir,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_personality
 SC_LTTNG_TRACEPOINT_EVENT(personality,
        TP_PROTO(sc_exit(long ret,) unsigned int personality),
        TP_ARGS(sc_exit(ret,) personality),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, personality))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(personality, personality))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, personality, personality)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsuid
 SC_LTTNG_TRACEPOINT_EVENT(setfsuid,
        TP_PROTO(sc_exit(long ret,) uid_t uid),
        TP_ARGS(sc_exit(ret,) uid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, uid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(uid, uid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, uid, uid)))
 )
 #endif
 #ifndef OVERRIDE_32_setfsgid
 SC_LTTNG_TRACEPOINT_EVENT(setfsgid,
        TP_PROTO(sc_exit(long ret,) gid_t gid),
        TP_ARGS(sc_exit(ret,) gid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, gid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gid, gid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, gid, gid)))
 )
 #endif
 #ifndef OVERRIDE_32_getsid
 SC_LTTNG_TRACEPOINT_EVENT(getsid,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_fdatasync
 SC_LTTNG_TRACEPOINT_EVENT(fdatasync,
        TP_PROTO(sc_exit(long ret,) unsigned int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_mlockall
 SC_LTTNG_TRACEPOINT_EVENT(mlockall,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_getscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid),
        TP_ARGS(sc_exit(ret,) pid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_get_priority_max
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_max,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_get_priority_min
 SC_LTTNG_TRACEPOINT_EVENT(sched_get_priority_min,
        TP_PROTO(sc_exit(long ret,) int policy),
        TP_ARGS(sc_exit(ret,) policy),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, policy))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(policy, policy))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, policy, policy)))
 )
 #endif
 #ifndef OVERRIDE_32_io_destroy
 SC_LTTNG_TRACEPOINT_EVENT(io_destroy,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx),
        TP_ARGS(sc_exit(ret,) ctx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx, ctx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx, ctx)))
 )
 #endif
 #ifndef OVERRIDE_32_exit_group
 SC_LTTNG_TRACEPOINT_EVENT(exit_group,
        TP_PROTO(sc_exit(long ret,) int error_code),
        TP_ARGS(sc_exit(ret,) error_code),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, error_code))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(error_code, error_code))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, error_code, error_code)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_create
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create,
        TP_PROTO(sc_exit(long ret,) int size),
        TP_ARGS(sc_exit(ret,) size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_getoverrun
 SC_LTTNG_TRACEPOINT_EVENT(timer_getoverrun,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_delete
 SC_LTTNG_TRACEPOINT_EVENT(timer_delete,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id),
        TP_ARGS(sc_exit(ret,) timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_unshare
 SC_LTTNG_TRACEPOINT_EVENT(unshare,
        TP_PROTO(sc_exit(long ret,) unsigned long unshare_flags),
        TP_ARGS(sc_exit(ret,) unshare_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, unshare_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unshare_flags, unshare_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, unshare_flags, unshare_flags)))
 )
 #endif
 #ifndef OVERRIDE_32_eventfd
 SC_LTTNG_TRACEPOINT_EVENT(eventfd,
        TP_PROTO(sc_exit(long ret,) unsigned int count),
        TP_ARGS(sc_exit(ret,) count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_create1
 SC_LTTNG_TRACEPOINT_EVENT(epoll_create1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_init1
 SC_LTTNG_TRACEPOINT_EVENT(inotify_init1,
        TP_PROTO(sc_exit(long ret,) int flags),
        TP_ARGS(sc_exit(ret,) flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_syncfs
 SC_LTTNG_TRACEPOINT_EVENT(syncfs,
        TP_PROTO(sc_exit(long ret,) int fd),
        TP_ARGS(sc_exit(ret,) fd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)))
 )
 #endif
 #ifndef OVERRIDE_32_kill
 SC_LTTNG_TRACEPOINT_EVENT(kill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_signal
 SC_LTTNG_TRACEPOINT_EVENT(signal,
        TP_PROTO(sc_exit(long ret,) int sig, __sighandler_t handler),
        TP_ARGS(sc_exit(ret,) sig, handler),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, sig)) sc_inout(__field(__sighandler_t, handler))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(sig, sig)) sc_inout(tp_assign(handler, handler))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, sig, sig)) sc_inout(ctf_integer(__sighandler_t, handler, handler)))
 )
 #endif
 #ifndef OVERRIDE_32_setpgid
 SC_LTTNG_TRACEPOINT_EVENT(setpgid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, pid_t pgid),
        TP_ARGS(sc_exit(ret,) pid, pgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(pid_t, pgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(pgid, pgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(pid_t, pgid, pgid)))
 )
 #endif
 #ifndef OVERRIDE_32_dup2
 SC_LTTNG_TRACEPOINT_EVENT(dup2,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd),
        TP_ARGS(sc_exit(ret,) oldfd, newfd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)))
 )
 #endif
 #ifndef OVERRIDE_32_setreuid
 SC_LTTNG_TRACEPOINT_EVENT(setreuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid),
        TP_ARGS(sc_exit(ret,) ruid, euid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)))
 )
 #endif
 #ifndef OVERRIDE_32_setregid
 SC_LTTNG_TRACEPOINT_EVENT(setregid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid),
        TP_ARGS(sc_exit(ret,) rgid, egid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)))
 )
 #endif
 #ifndef OVERRIDE_32_munmap
 SC_LTTNG_TRACEPOINT_EVENT(munmap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, size_t len),
        TP_ARGS(sc_exit(ret,) addr, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_ftruncate
 SC_LTTNG_TRACEPOINT_EVENT(ftruncate,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long length),
        TP_ARGS(sc_exit(ret,) fd, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_fchmod
 SC_LTTNG_TRACEPOINT_EVENT(fchmod,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, mode_t mode),
        TP_ARGS(sc_exit(ret,) fd, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(mode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(mode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_getpriority
 SC_LTTNG_TRACEPOINT_EVENT(getpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_32_bdflush
 SC_LTTNG_TRACEPOINT_EVENT(bdflush,
        TP_PROTO(sc_exit(long ret,) int func, long data),
        TP_ARGS(sc_exit(ret,) func, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, func)) sc_inout(__field(long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(func, func)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, func, func)) sc_inout(ctf_integer(long, data, data)))
 )
 #endif
 #ifndef OVERRIDE_32_flock
 SC_LTTNG_TRACEPOINT_EVENT(flock,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd),
        TP_ARGS(sc_exit(ret,) fd, cmd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)))
 )
 #endif
 #ifndef OVERRIDE_32_mlock
 SC_LTTNG_TRACEPOINT_EVENT(mlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_munlock
 SC_LTTNG_TRACEPOINT_EVENT(munlock,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len),
        TP_ARGS(sc_exit(ret,) start, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_tkill
 SC_LTTNG_TRACEPOINT_EVENT(tkill,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_ioprio_get
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_get,
        TP_PROTO(sc_exit(long ret,) int which, int who),
        TP_ARGS(sc_exit(ret,) which, who),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_rm_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_rm_watch,
        TP_PROTO(sc_exit(long ret,) int fd, __s32 wd),
        TP_ARGS(sc_exit(ret,) fd, wd),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(__s32, wd))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(wd, wd))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(__s32, wd, wd)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_create
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_create,
        TP_PROTO(sc_exit(long ret,) int clockid, int flags),
        TP_ARGS(sc_exit(ret,) clockid, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, clockid)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(clockid, clockid)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, clockid, clockid)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_eventfd2
 SC_LTTNG_TRACEPOINT_EVENT(eventfd2,
        TP_PROTO(sc_exit(long ret,) unsigned int count, int flags),
        TP_ARGS(sc_exit(ret,) count, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, count)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(count, count)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, count, count)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_listen
 SC_LTTNG_TRACEPOINT_EVENT(listen,
        TP_PROTO(sc_exit(long ret,) int fd, int backlog),
        TP_ARGS(sc_exit(ret,) fd, backlog),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, backlog))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(backlog, backlog))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, backlog, backlog)))
 )
 #endif
 #ifndef OVERRIDE_32_shutdown
 SC_LTTNG_TRACEPOINT_EVENT(shutdown,
        TP_PROTO(sc_exit(long ret,) int fd, int how),
        TP_ARGS(sc_exit(ret,) fd, how),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, how))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(how, how))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, how, how)))
 )
 #endif
 #ifndef OVERRIDE_32_setns
 SC_LTTNG_TRACEPOINT_EVENT(setns,
        TP_PROTO(sc_exit(long ret,) int fd, int nstype),
        TP_ARGS(sc_exit(ret,) fd, nstype),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, nstype))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(nstype, nstype))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, nstype, nstype)))
 )
 #endif
 #ifndef OVERRIDE_32_lseek
 SC_LTTNG_TRACEPOINT_EVENT(lseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, off_t offset, unsigned int origin),
        TP_ARGS(sc_exit(ret,) fd, offset, origin),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(off_t, offset)) sc_in(__field(unsigned int, origin))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(offset, offset)) sc_in(tp_assign(origin, origin))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(off_t, offset, offset)) sc_in(ctf_integer(unsigned int, origin, origin)))
 )
 #endif                                                                                                                                                                                                                      
 #ifndef OVERRIDE_32_ioctl
 SC_LTTNG_TRACEPOINT_EVENT(ioctl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_fcntl
 SC_LTTNG_TRACEPOINT_EVENT(fcntl,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_fchown
 SC_LTTNG_TRACEPOINT_EVENT(fchown,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) fd, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_setpriority
 SC_LTTNG_TRACEPOINT_EVENT(setpriority,
        TP_PROTO(sc_exit(long ret,) int which, int who, int niceval),
        TP_ARGS(sc_exit(ret,) which, who, niceval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, niceval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(niceval, niceval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, niceval, niceval)))
 )
 #endif
 #ifndef OVERRIDE_32_mprotect
 SC_LTTNG_TRACEPOINT_EVENT(mprotect,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned long prot),
        TP_ARGS(sc_exit(ret,) start, len, prot),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(unsigned long, prot))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(prot, prot))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned long, prot, prot)))
 )
 #endif
 #ifndef OVERRIDE_32_sysfs
 SC_LTTNG_TRACEPOINT_EVENT(sysfs,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg1, unsigned long arg2),
        TP_ARGS(sc_exit(ret,) option, arg1, arg2),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_in(__field(unsigned long, arg1)) sc_in(__field(unsigned long, arg2))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_in(tp_assign(arg1, arg1)) sc_in(tp_assign(arg2, arg2))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_in(ctf_integer(unsigned long, arg1, arg1)) sc_in(ctf_integer(unsigned long, arg2, arg2)))
 )
 #endif
 #ifndef OVERRIDE_32_msync
 SC_LTTNG_TRACEPOINT_EVENT(msync,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, int flags),
        TP_ARGS(sc_exit(ret,) start, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_setresuid
 SC_LTTNG_TRACEPOINT_EVENT(setresuid,
        TP_PROTO(sc_exit(long ret,) uid_t ruid, uid_t euid, uid_t suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(uid_t, ruid)) sc_in(__field(uid_t, euid)) sc_in(__field(uid_t, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ruid, ruid)) sc_in(tp_assign(euid, euid)) sc_in(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(uid_t, ruid, ruid)) sc_in(ctf_integer(uid_t, euid, euid)) sc_in(ctf_integer(uid_t, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_setresgid
 SC_LTTNG_TRACEPOINT_EVENT(setresgid,
        TP_PROTO(sc_exit(long ret,) gid_t rgid, gid_t egid, gid_t sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(gid_t, rgid)) sc_in(__field(gid_t, egid)) sc_in(__field(gid_t, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rgid, rgid)) sc_in(tp_assign(egid, egid)) sc_in(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(gid_t, rgid, rgid)) sc_in(ctf_integer(gid_t, egid, egid)) sc_in(ctf_integer(gid_t, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_fcntl64
 SC_LTTNG_TRACEPOINT_EVENT(fcntl64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(sc_exit(ret,) fd, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned int, cmd)) sc_inout(__field(unsigned long, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned int, cmd, cmd)) sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_madvise
 SC_LTTNG_TRACEPOINT_EVENT(madvise,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len_in, int behavior),
        TP_ARGS(sc_exit(ret,) start, len_in, behavior),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len_in)) sc_in(__field(int, behavior))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len_in, len_in)) sc_in(tp_assign(behavior, behavior))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len_in, len_in)) sc_in(ctf_integer(int, behavior, behavior)))
 )
 #endif
 #ifndef OVERRIDE_32_tgkill
 SC_LTTNG_TRACEPOINT_EVENT(tgkill,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_ioprio_set
 SC_LTTNG_TRACEPOINT_EVENT(ioprio_set,
        TP_PROTO(sc_exit(long ret,) int which, int who, int ioprio),
        TP_ARGS(sc_exit(ret,) which, who, ioprio),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(int, who)) sc_in(__field(int, ioprio))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(who, who)) sc_in(tp_assign(ioprio, ioprio))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(int, who, who)) sc_in(ctf_integer(int, ioprio, ioprio)))
 )
 #endif
 #ifndef OVERRIDE_32_dup3
 SC_LTTNG_TRACEPOINT_EVENT(dup3,
        TP_PROTO(sc_exit(long ret,) unsigned int oldfd, unsigned int newfd, int flags),
        TP_ARGS(sc_exit(ret,) oldfd, newfd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, oldfd)) sc_in(__field(unsigned int, newfd)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(oldfd, oldfd)) sc_in(tp_assign(newfd, newfd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, oldfd, oldfd)) sc_in(ctf_integer(unsigned int, newfd, newfd)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_socket
 SC_LTTNG_TRACEPOINT_EVENT(socket,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol),
        TP_ARGS(sc_exit(ret,) family, type, protocol),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)))
 )
 #endif
 #ifndef OVERRIDE_32_ptrace
 SC_LTTNG_TRACEPOINT_EVENT(ptrace,
        TP_PROTO(sc_exit(long ret,) long request, long pid, unsigned long addr, unsigned long data),
        TP_ARGS(sc_exit(ret,) request, pid, addr, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(long, request)) sc_in(__field(long, pid)) sc_inout(__field_hex(unsigned long, addr)) sc_inout(__field(unsigned long, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(request, request)) sc_in(tp_assign(pid, pid)) sc_inout(tp_assign(addr, addr)) sc_inout(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(long, request, request)) sc_in(ctf_integer(long, pid, pid)) sc_inout(ctf_integer(unsigned long, addr, addr)) sc_inout(ctf_integer(unsigned long, data, data)))
 )
 #endif                                                                                                                                                                                                        
 #ifndef OVERRIDE_32_tee
 SC_LTTNG_TRACEPOINT_EVENT(tee,
        TP_PROTO(sc_exit(long ret,) int fdin, int fdout, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fdin, fdout, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fdin)) sc_in(__field(int, fdout)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fdin, fdin)) sc_in(tp_assign(fdout, fdout)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fdin, fdin)) sc_in(ctf_integer(int, fdout, fdout)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_mremap
 SC_LTTNG_TRACEPOINT_EVENT(mremap,
        TP_PROTO(sc_exit(long ret,) unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr),
        TP_ARGS(sc_exit(ret,) addr, old_len, new_len, flags, new_addr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(unsigned long, old_len)) sc_in(__field(unsigned long, new_len)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(unsigned long, new_addr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(old_len, old_len)) sc_in(tp_assign(new_len, new_len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_addr, new_addr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, addr, addr)) sc_in(ctf_integer(unsigned long, old_len, old_len)) sc_in(ctf_integer(unsigned long, new_len, new_len)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(unsigned long, new_addr, new_addr)))
 )
 #endif
 #ifndef OVERRIDE_32_prctl
 SC_LTTNG_TRACEPOINT_EVENT(prctl,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(sc_exit(ret,) option, arg2, arg3, arg4, arg5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_inout(__field(unsigned long, arg2)) sc_in(__field(unsigned long, arg3)) sc_in(__field(unsigned long, arg4)) sc_in(__field(unsigned long, arg5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_inout(tp_assign(arg2, arg2)) sc_in(tp_assign(arg3, arg3)) sc_in(tp_assign(arg4, arg4)) sc_in(tp_assign(arg5, arg5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_inout(ctf_integer(unsigned long, arg2, arg2)) sc_in(ctf_integer(unsigned long, arg3, arg3)) sc_in(ctf_integer(unsigned long, arg4, arg4)) sc_in(ctf_integer(unsigned long, arg5, arg5)))
 )
 #endif
 #ifndef OVERRIDE_32_remap_file_pages
 SC_LTTNG_TRACEPOINT_EVENT(remap_file_pages,
        TP_PROTO(sc_exit(long ret,) unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long flags),
        TP_ARGS(sc_exit(ret,) start, size, prot, pgoff, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(unsigned long, size)) sc_in(__field(unsigned long, prot)) sc_in(__field(unsigned long, pgoff)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(size, size)) sc_in(tp_assign(prot, prot)) sc_in(tp_assign(pgoff, pgoff)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(unsigned long, size, size)) sc_in(ctf_integer(unsigned long, prot, prot)) sc_in(ctf_integer(unsigned long, pgoff, pgoff)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_keyctl
 SC_LTTNG_TRACEPOINT_EVENT(keyctl,
        TP_PROTO(sc_exit(long ret,) int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(sc_exit(ret,) option, arg2, arg3, arg4, arg5),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, option)) sc_inout(__field(unsigned long, arg2)) sc_inout(__field(unsigned long, arg3)) sc_inout(__field(unsigned long, arg4)) sc_inout(__field(unsigned long, arg5))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(option, option)) sc_inout(tp_assign(arg2, arg2)) sc_inout(tp_assign(arg3, arg3)) sc_inout(tp_assign(arg4, arg4)) sc_inout(tp_assign(arg5, arg5))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, option, option)) sc_inout(ctf_integer(unsigned long, arg2, arg2)) sc_inout(ctf_integer(unsigned long, arg3, arg3)) sc_inout(ctf_integer(unsigned long, arg4, arg4)) sc_inout(ctf_integer(unsigned long, arg5, arg5)))
 )
 #endif
 

diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h
index 823fb737eeb754bf7f886783c2ed535df28a1e91..d992c8f5d6eecb1625e10b24b63ba2ab8f3b99a9 100644 (file)
--- a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h
+++ b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h
@@ -13,1719 +13,1337 @@
 SC_LTTNG_TRACEPOINT_EVENT(unlink,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif                                                                                                                                                                                                                                                    
 #ifndef OVERRIDE_32_chdir
 SC_LTTNG_TRACEPOINT_EVENT(chdir,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif                                                                                                                                                                                                                                                     
 #ifndef OVERRIDE_32_time
 SC_LTTNG_TRACEPOINT_EVENT(time,
        TP_PROTO(sc_exit(long ret,) time_t * tloc),
        TP_ARGS(sc_exit(ret,) tloc),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(time_t *, tloc))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tloc, tloc))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(time_t *, tloc, tloc)))
 )
 #endif                                                                                                                                                                                                                                                              
 #ifndef OVERRIDE_32_oldumount
 SC_LTTNG_TRACEPOINT_EVENT(oldumount,
        TP_PROTO(sc_exit(long ret,) char * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(name, name)))
 )
 #endif                                                                                                                                                                                                                                                           
 #ifndef OVERRIDE_32_stime
 SC_LTTNG_TRACEPOINT_EVENT(stime,
        TP_PROTO(sc_exit(long ret,) time_t * tptr),
        TP_ARGS(sc_exit(ret,) tptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(time_t *, tptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(tptr, tptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(time_t *, tptr, tptr)))
 )
 #endif                                                                                                                                                                                                                                                             
 #ifndef OVERRIDE_32_rmdir
 SC_LTTNG_TRACEPOINT_EVENT(rmdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)))
 )
 #endif
 #ifndef OVERRIDE_32_pipe
 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(__field_hex(int *, fildes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(fildes, fildes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(int *, fildes, fildes)))
 )
 #endif
 #ifndef OVERRIDE_32_times
 SC_LTTNG_TRACEPOINT_EVENT(times,
        TP_PROTO(sc_exit(long ret,) struct tms * tbuf),
        TP_ARGS(sc_exit(ret,) tbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct tms *, tbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tbuf, tbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct tms *, tbuf, tbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_acct
 SC_LTTNG_TRACEPOINT_EVENT(acct,
        TP_PROTO(sc_exit(long ret,) const char * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_olduname
 SC_LTTNG_TRACEPOINT_EVENT(olduname,
        TP_PROTO(sc_exit(long ret,) struct oldold_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct oldold_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct oldold_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_chroot
 SC_LTTNG_TRACEPOINT_EVENT(chroot,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)))
 )
 #endif
 #ifndef OVERRIDE_32_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(sigpending,
        TP_PROTO(sc_exit(long ret,) old_sigset_t * set),
        TP_ARGS(sc_exit(ret,) set),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(old_sigset_t *, set))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(set, set))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(old_sigset_t *, set, set)))
 )
 #endif
 #ifndef OVERRIDE_32_uselib
 SC_LTTNG_TRACEPOINT_EVENT(uselib,
        TP_PROTO(sc_exit(long ret,) const char * library),
        TP_ARGS(sc_exit(ret,) library),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(const char *, library))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(library, library))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(const char *, library, library)))
 )
 #endif
 #ifndef OVERRIDE_32_uname
 SC_LTTNG_TRACEPOINT_EVENT(uname,
        TP_PROTO(sc_exit(long ret,) struct old_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct old_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct old_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_swapoff
 SC_LTTNG_TRACEPOINT_EVENT(swapoff,
        TP_PROTO(sc_exit(long ret,) const char * specialfile),
        TP_ARGS(sc_exit(ret,) specialfile),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(specialfile, specialfile))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(specialfile, specialfile)))
 )
 #endif
 #ifndef OVERRIDE_32_sysinfo
 SC_LTTNG_TRACEPOINT_EVENT(sysinfo,
        TP_PROTO(sc_exit(long ret,) struct sysinfo * info),
        TP_ARGS(sc_exit(ret,) info),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct sysinfo *, info))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(info, info))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct sysinfo *, info, info)))
 )
 #endif
 #ifndef OVERRIDE_32_newuname
 SC_LTTNG_TRACEPOINT_EVENT(newuname,
        TP_PROTO(sc_exit(long ret,) struct new_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct new_utsname *, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct new_utsname *, name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_adjtimex
 SC_LTTNG_TRACEPOINT_EVENT(adjtimex,
        TP_PROTO(sc_exit(long ret,) struct timex * txc_p),
        TP_ARGS(sc_exit(ret,) txc_p),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct timex *, txc_p))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(txc_p, txc_p))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct timex *, txc_p, txc_p)))
 )
 #endif
 #ifndef OVERRIDE_32_sysctl
 SC_LTTNG_TRACEPOINT_EVENT(sysctl,
        TP_PROTO(sc_exit(long ret,) struct __sysctl_args * args),
        TP_ARGS(sc_exit(ret,) args),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct __sysctl_args *, args))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(args, args))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct __sysctl_args *, args, args)))
 )
 #endif
 #ifndef OVERRIDE_32_set_tid_address
 SC_LTTNG_TRACEPOINT_EVENT(set_tid_address,
        TP_PROTO(sc_exit(long ret,) int * tidptr),
        TP_ARGS(sc_exit(ret,) tidptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(int *, tidptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tidptr, tidptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int *, tidptr, tidptr)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_unlink
 SC_LTTNG_TRACEPOINT_EVENT(mq_unlink,
        TP_PROTO(sc_exit(long ret,) const char * u_name),
        TP_ARGS(sc_exit(ret,) u_name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(u_name, u_name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(u_name, u_name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(u_name, u_name)))
 )
 #endif
 #ifndef OVERRIDE_32_creat
 SC_LTTNG_TRACEPOINT_EVENT(creat,
        TP_PROTO(sc_exit(long ret,) const char * pathname, int mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif                                                                                                                                                                                                                                           
 #ifndef OVERRIDE_32_link
 SC_LTTNG_TRACEPOINT_EVENT(link,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif                                                                                                                                                                                                                                 
 #ifndef OVERRIDE_32_chmod
 SC_LTTNG_TRACEPOINT_EVENT(chmod,
        TP_PROTO(sc_exit(long ret,) const char * filename, mode_t mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(mode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(mode_t, mode, mode)))
 )
 #endif                                                                                                                                                                                                                                       
 #ifndef OVERRIDE_32_stat
 SC_LTTNG_TRACEPOINT_EVENT(stat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct __old_kernel_stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct __old_kernel_stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct __old_kernel_stat *, statbuf, statbuf)))
 )
 #endif                                                                                                                                                                                                                 
 #ifndef OVERRIDE_32_fstat
 SC_LTTNG_TRACEPOINT_EVENT(fstat,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct __old_kernel_stat * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field_hex(struct __old_kernel_stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(struct __old_kernel_stat *, statbuf, statbuf)))
 )
 #endif                                                                                                                                                                                                                      
 #ifndef OVERRIDE_32_utime
 SC_LTTNG_TRACEPOINT_EVENT(utime,
        TP_PROTO(sc_exit(long ret,) char * filename, struct utimbuf * times),
        TP_ARGS(sc_exit(ret,) filename, times),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct utimbuf *, times))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(times, times))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct utimbuf *, times, times)))
 )
 #endif                                                                                                                                                                                                                                  
 #ifndef OVERRIDE_32_access
 SC_LTTNG_TRACEPOINT_EVENT(access,
        TP_PROTO(sc_exit(long ret,) const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif                                                                                                                                                                                                                                         
 #ifndef OVERRIDE_32_rename
 SC_LTTNG_TRACEPOINT_EVENT(rename,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_mkdir
 SC_LTTNG_TRACEPOINT_EVENT(mkdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname, int mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_umount
 SC_LTTNG_TRACEPOINT_EVENT(umount,
        TP_PROTO(sc_exit(long ret,) char * name, int flags),
        TP_ARGS(sc_exit(ret,) name, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_ustat
 SC_LTTNG_TRACEPOINT_EVENT(ustat,
        TP_PROTO(sc_exit(long ret,) unsigned dev, struct ustat * ubuf),
        TP_ARGS(sc_exit(ret,) dev, ubuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, dev)) sc_out(__field_hex(struct ustat *, ubuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dev, dev)) sc_out(tp_assign(ubuf, ubuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, dev, dev)) sc_out(ctf_integer(struct ustat *, ubuf, ubuf)))
 )
 #endif
 #ifndef OVERRIDE_32_sethostname
 SC_LTTNG_TRACEPOINT_EVENT(sethostname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setrlimit
 SC_LTTNG_TRACEPOINT_EVENT(setrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_old_getrlimit
 SC_LTTNG_TRACEPOINT_EVENT(old_getrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, resource)) sc_inout(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(resource, resource)) sc_inout(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, resource, resource)) sc_inout(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_getrusage
 SC_LTTNG_TRACEPOINT_EVENT(getrusage,
        TP_PROTO(sc_exit(long ret,) int who, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) who, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, who)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(who, who)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, who, who)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_gettimeofday
 SC_LTTNG_TRACEPOINT_EVENT(gettimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct timeval *, tv)) sc_out(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(tv, tv)) sc_out(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(struct timeval *, tv, tv)) sc_out(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_32_settimeofday
 SC_LTTNG_TRACEPOINT_EVENT(settimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timeval *, tv)) sc_in(__field_hex(struct timezone *, tz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tv, tv)) sc_in(tp_assign(tz, tz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timeval *, tv, tv)) sc_in(ctf_integer(struct timezone *, tz, tz)))
 )
 #endif
 #ifndef OVERRIDE_32_getgroups
 SC_LTTNG_TRACEPOINT_EVENT(getgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_out(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_out(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_out(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_setgroups
 SC_LTTNG_TRACEPOINT_EVENT(setgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_in(__field_hex(gid_t *, grouplist))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(gidsetsize, gidsetsize)) sc_in(tp_assign(grouplist, grouplist))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, gidsetsize, gidsetsize)) sc_in(ctf_integer(gid_t *, grouplist, grouplist)))
 )
 #endif
 #ifndef OVERRIDE_32_symlink
 SC_LTTNG_TRACEPOINT_EVENT(symlink,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_lstat
 SC_LTTNG_TRACEPOINT_EVENT(lstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct __old_kernel_stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct __old_kernel_stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct __old_kernel_stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_swapon
 SC_LTTNG_TRACEPOINT_EVENT(swapon,
        TP_PROTO(sc_exit(long ret,) const char * specialfile, int swap_flags),
        TP_ARGS(sc_exit(ret,) specialfile, swap_flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile)) sc_in(__field(int, swap_flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(specialfile, specialfile)) sc_in(tp_assign(swap_flags, swap_flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(specialfile, specialfile)) sc_in(ctf_integer(int, swap_flags, swap_flags)))
 )
 #endif
 #ifndef OVERRIDE_32_truncate
 SC_LTTNG_TRACEPOINT_EVENT(truncate,
        TP_PROTO(sc_exit(long ret,) const char * path, long length),
        TP_ARGS(sc_exit(ret,) path, length),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_in(__field(long, length))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_in(tp_assign(length, length))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_in(ctf_integer(long, length, length)))
 )
 #endif
 #ifndef OVERRIDE_32_statfs
 SC_LTTNG_TRACEPOINT_EVENT(statfs,
        TP_PROTO(sc_exit(long ret,) const char * pathname, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) pathname, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatfs
 SC_LTTNG_TRACEPOINT_EVENT(fstatfs,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) fd, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct statfs *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct statfs *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_socketcall
 SC_LTTNG_TRACEPOINT_EVENT(socketcall,
        TP_PROTO(sc_exit(long ret,) int call, unsigned long * args),
        TP_ARGS(sc_exit(ret,) call, args),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, call)) sc_inout(__field_hex(unsigned long *, args))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(call, call)) sc_inout(tp_assign(args, args))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, call, call)) sc_inout(ctf_integer(unsigned long *, args, args)))
 )
 #endif
 #ifndef OVERRIDE_32_getitimer
 SC_LTTNG_TRACEPOINT_EVENT(getitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value),
        TP_ARGS(sc_exit(ret,) which, value),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_out(__field_hex(struct itimerval *, value))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_out(tp_assign(value, value))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_out(ctf_integer(struct itimerval *, value, value)))
 )
 #endif
 #ifndef OVERRIDE_32_newstat
 SC_LTTNG_TRACEPOINT_EVENT(newstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_newlstat
 SC_LTTNG_TRACEPOINT_EVENT(newlstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_newfstat
 SC_LTTNG_TRACEPOINT_EVENT(newfstat,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct stat *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct stat *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_setdomainname
 SC_LTTNG_TRACEPOINT_EVENT(setdomainname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_delete_module
 SC_LTTNG_TRACEPOINT_EVENT(delete_module,
        TP_PROTO(sc_exit(long ret,) const char * name_user, unsigned int flags),
        TP_ARGS(sc_exit(ret,) name_user, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name_user, name_user)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(name_user, name_user)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(name_user, name_user)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_setparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getparam
 SC_LTTNG_TRACEPOINT_EVENT(sched_getparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_rr_get_interval
 SC_LTTNG_TRACEPOINT_EVENT(sched_rr_get_interval,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct timespec * interval),
        TP_ARGS(sc_exit(ret,) pid, interval),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct timespec *, interval))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(interval, interval))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_out(ctf_integer(struct timespec *, interval, interval)))
 )
 #endif
 #ifndef OVERRIDE_32_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(nanosleep,
        TP_PROTO(sc_exit(long ret,) struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigpending
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigpending,
        TP_PROTO(sc_exit(long ret,) sigset_t * set, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) set, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(sigset_t *, set)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(set, set)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(sigset_t *, set, set)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigsuspend
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigsuspend,
        TP_PROTO(sc_exit(long ret,) sigset_t * unewset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) unewset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(sigset_t *, unewset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(unewset, unewset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(sigset_t *, unewset, unewset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_getcwd
 SC_LTTNG_TRACEPOINT_EVENT(getcwd,
        TP_PROTO(sc_exit(long ret,) char * buf, unsigned long size),
        TP_ARGS(sc_exit(ret,) buf, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(char *, buf)) sc_in(__field(unsigned long, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(unsigned long, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_getrlimit
 SC_LTTNG_TRACEPOINT_EVENT(getrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_out(__field_hex(struct rlimit *, rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(resource, resource)) sc_out(tp_assign(rlim, rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_out(ctf_integer(struct rlimit *, rlim, rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_stat64
 SC_LTTNG_TRACEPOINT_EVENT(stat64,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_lstat64
 SC_LTTNG_TRACEPOINT_EVENT(lstat64,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstat64
 SC_LTTNG_TRACEPOINT_EVENT(fstat64,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, struct stat64 * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, fd)) sc_inout(__field_hex(struct stat64 *, statbuf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(statbuf, statbuf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)))
 )
 #endif
 #ifndef OVERRIDE_32_pivot_root
 SC_LTTNG_TRACEPOINT_EVENT(pivot_root,
        TP_PROTO(sc_exit(long ret,) const char * new_root, const char * put_old),
        TP_ARGS(sc_exit(ret,) new_root, put_old),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(new_root, new_root)) sc_in(__string_from_user(put_old, put_old))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(new_root, new_root)) sc_in(tp_copy_string_from_user(put_old, put_old))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(new_root, new_root)) sc_in(ctf_user_string(put_old, put_old)))
 )
 #endif
 #ifndef OVERRIDE_32_removexattr
 SC_LTTNG_TRACEPOINT_EVENT(removexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_lremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(lremovexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_fremovexattr
 SC_LTTNG_TRACEPOINT_EVENT(fremovexattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name),
        TP_ARGS(sc_exit(ret,) fd, name),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)))
 )
 #endif
 #ifndef OVERRIDE_32_io_setup
 SC_LTTNG_TRACEPOINT_EVENT(io_setup,
        TP_PROTO(sc_exit(long ret,) unsigned nr_events, aio_context_t * ctxp),
        TP_ARGS(sc_exit(ret,) nr_events, ctxp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, nr_events)) sc_in(__field_hex(aio_context_t *, ctxp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(nr_events, nr_events)) sc_in(tp_assign(ctxp, ctxp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned, nr_events, nr_events)) sc_in(ctf_integer(aio_context_t *, ctxp, ctxp)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timer_gettime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, struct itimerspec * setting),
        TP_ARGS(sc_exit(ret,) timer_id, setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_out(__field_hex(struct itimerspec *, setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_out(tp_assign(setting, setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_out(ctf_integer(struct itimerspec *, setting, setting)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_settime
 SC_LTTNG_TRACEPOINT_EVENT(clock_settime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, const struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(const struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(const struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_gettime
 SC_LTTNG_TRACEPOINT_EVENT(clock_gettime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_getres
 SC_LTTNG_TRACEPOINT_EVENT(clock_getres,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_out(tp_assign(tp, tp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_out(ctf_integer(struct timespec *, tp, tp)))
 )
 #endif
 #ifndef OVERRIDE_32_utimes
 SC_LTTNG_TRACEPOINT_EVENT(utimes,
        TP_PROTO(sc_exit(long ret,) char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_notify
 SC_LTTNG_TRACEPOINT_EVENT(mq_notify,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const struct sigevent * u_notification),
        TP_ARGS(sc_exit(ret,) mqdes, u_notification),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const struct sigevent *, u_notification))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_in(tp_assign(u_notification, u_notification))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_in(ctf_integer(const struct sigevent *, u_notification, u_notification)))
 )
 #endif
 #ifndef OVERRIDE_32_set_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(set_robust_list,
        TP_PROTO(sc_exit(long ret,) struct robust_list_head * head, size_t len),
        TP_ARGS(sc_exit(ret,) head, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct robust_list_head *, head)) sc_in(__field(size_t, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(head, head)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct robust_list_head *, head, head)) sc_in(ctf_integer(size_t, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_gettime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_gettime,
        TP_PROTO(sc_exit(long ret,) int ufd, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_32_pipe2
 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(__field_hex(int *, fildes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(fildes, fildes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(int *, fildes, fildes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_adjtime
 SC_LTTNG_TRACEPOINT_EVENT(clock_adjtime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timex * utx),
        TP_ARGS(sc_exit(ret,) which_clock, utx),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_inout(__field_hex(struct timex *, utx))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_inout(tp_assign(utx, utx))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_inout(ctf_integer(struct timex *, utx, utx)))
 )
 #endif
 #ifndef OVERRIDE_32_read
 SC_LTTNG_TRACEPOINT_EVENT(read,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif                                                                                                                                                                            
 #ifndef OVERRIDE_32_write
 SC_LTTNG_TRACEPOINT_EVENT(write,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buf, buf)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_in(ctf_integer(const char *, buf, buf)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif                                                                                                                                                                                                                          
 #ifndef OVERRIDE_32_open
 SC_LTTNG_TRACEPOINT_EVENT(open,
        TP_PROTO(sc_exit(long ret,) const char * filename, int flags, int mode),
        TP_ARGS(sc_exit(ret,) filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif                                                                                                                                                                                                                                
 #ifndef OVERRIDE_32_waitpid
 SC_LTTNG_TRACEPOINT_EVENT(waitpid,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int * stat_addr, int options),
        TP_ARGS(sc_exit(ret,) pid, stat_addr, options),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(pid_t, pid)) sc_inout(__field_hex(int *, stat_addr)) sc_inout(__field(int, options))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(pid, pid)) sc_inout(tp_assign(stat_addr, stat_addr)) sc_inout(tp_assign(options, options))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(pid_t, pid, pid)) sc_inout(ctf_integer(int *, stat_addr, stat_addr)) sc_inout(ctf_integer(int, options, options)))
 )
 #endif                                                                                                                                                                                                                                
 #ifndef OVERRIDE_32_mknod
 SC_LTTNG_TRACEPOINT_EVENT(mknod,
        TP_PROTO(sc_exit(long ret,) const char * filename, int mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif                                                                                                                                                                                                                           
 #ifndef OVERRIDE_32_lchown
 SC_LTTNG_TRACEPOINT_EVENT(lchown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif                                                                                                                                                                                                                         
 #ifndef OVERRIDE_32_readlink
 SC_LTTNG_TRACEPOINT_EVENT(readlink,
        TP_PROTO(sc_exit(long ret,) const char * path, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) path, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(path, path)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(path, path)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_32_old_readdir
 SC_LTTNG_TRACEPOINT_EVENT(old_readdir,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct old_linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field_hex(struct old_linux_dirent *, dirent)) sc_inout(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(dirent, dirent)) sc_inout(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(struct old_linux_dirent *, dirent, dirent)) sc_inout(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_syslog
 SC_LTTNG_TRACEPOINT_EVENT(syslog,
        TP_PROTO(sc_exit(long ret,) int type, char * buf, int len),
        TP_ARGS(sc_exit(ret,) type, buf, len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, type)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(type, type)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(len, len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, type, type)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, len, len)))
 )
 #endif
 #ifndef OVERRIDE_32_setitimer
 SC_LTTNG_TRACEPOINT_EVENT(setitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value, struct itimerval * ovalue),
        TP_ARGS(sc_exit(ret,) which, value, ovalue),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field_hex(struct itimerval *, value)) sc_out(__field_hex(struct itimerval *, ovalue))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(value, value)) sc_out(tp_assign(ovalue, ovalue))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(struct itimerval *, value, value)) sc_out(ctf_integer(struct itimerval *, ovalue, ovalue)))
 )
 #endif
 #ifndef OVERRIDE_32_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, old_sigset_t * nset, old_sigset_t * oset),
        TP_ARGS(sc_exit(ret,) how, nset, oset),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, how)) sc_inout(__field_hex(old_sigset_t *, nset)) sc_inout(__field_hex(old_sigset_t *, oset))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(how, how)) sc_inout(tp_assign(nset, nset)) sc_inout(tp_assign(oset, oset))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, how, how)) sc_inout(ctf_integer(old_sigset_t *, nset, nset)) sc_inout(ctf_integer(old_sigset_t *, oset, oset)))
 )
 #endif
 #ifndef OVERRIDE_32_init_module
 SC_LTTNG_TRACEPOINT_EVENT(init_module,
        TP_PROTO(sc_exit(long ret,) void * umod, unsigned long len, const char * uargs),
        TP_ARGS(sc_exit(ret,) umod, len, uargs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(void *, umod)) sc_in(__field(unsigned long, len)) sc_in(__field_hex(const char *, uargs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(umod, umod)) sc_in(tp_assign(len, len)) sc_in(tp_assign(uargs, uargs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(void *, umod, umod)) sc_in(ctf_integer(unsigned long, len, len)) sc_in(ctf_integer(const char *, uargs, uargs)))
 )
 #endif
 #ifndef OVERRIDE_32_getdents
 SC_LTTNG_TRACEPOINT_EVENT(getdents,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_readv
 SC_LTTNG_TRACEPOINT_EVENT(readv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_32_writev
 SC_LTTNG_TRACEPOINT_EVENT(writev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_inout(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setscheduler
 SC_LTTNG_TRACEPOINT_EVENT(sched_setscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int policy, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, policy, param),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, policy)) sc_in(__field_hex(struct sched_param *, param))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(policy, policy)) sc_in(tp_assign(param, param))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, policy, policy)) sc_in(ctf_integer(struct sched_param *, param, param)))
 )
 #endif
 #ifndef OVERRIDE_32_getresuid
 SC_LTTNG_TRACEPOINT_EVENT(getresuid,
        TP_PROTO(sc_exit(long ret,) uid_t * ruid, uid_t * euid, uid_t * suid),
        TP_ARGS(sc_exit(ret,) ruid, euid, suid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(uid_t *, ruid)) sc_out(__field_hex(uid_t *, euid)) sc_out(__field_hex(uid_t *, suid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(ruid, ruid)) sc_out(tp_assign(euid, euid)) sc_out(tp_assign(suid, suid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(uid_t *, ruid, ruid)) sc_out(ctf_integer(uid_t *, euid, euid)) sc_out(ctf_integer(uid_t *, suid, suid)))
 )
 #endif
 #ifndef OVERRIDE_32_poll
 SC_LTTNG_TRACEPOINT_EVENT(poll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, long timeout_msecs),
        TP_ARGS(sc_exit(ret,) ufds, nfds, timeout_msecs),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field(long, timeout_msecs))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(timeout_msecs, timeout_msecs))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(long, timeout_msecs, timeout_msecs)))
 )
 #endif
 #ifndef OVERRIDE_32_nfsservctl
 SC_LTTNG_TRACEPOINT_EVENT(nfsservctl,
        TP_PROTO(sc_exit(long ret,) int cmd, struct nfsctl_arg * arg, void * res),
        TP_ARGS(sc_exit(ret,) cmd, arg, res),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, cmd)) sc_inout(__field_hex(struct nfsctl_arg *, arg)) sc_inout(__field_hex(void *, res))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(cmd, cmd)) sc_inout(tp_assign(arg, arg)) sc_inout(tp_assign(res, res))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, cmd, cmd)) sc_inout(ctf_integer(struct nfsctl_arg *, arg, arg)) sc_inout(ctf_integer(void *, res, res)))
 )
 #endif
 #ifndef OVERRIDE_32_getresgid
 SC_LTTNG_TRACEPOINT_EVENT(getresgid,
        TP_PROTO(sc_exit(long ret,) gid_t * rgid, gid_t * egid, gid_t * sgid),
        TP_ARGS(sc_exit(ret,) rgid, egid, sgid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(gid_t *, rgid)) sc_out(__field_hex(gid_t *, egid)) sc_out(__field_hex(gid_t *, sgid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(rgid, rgid)) sc_out(tp_assign(egid, egid)) sc_out(tp_assign(sgid, sgid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(gid_t *, rgid, rgid)) sc_out(ctf_integer(gid_t *, egid, egid)) sc_out(ctf_integer(gid_t *, sgid, sgid)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_32_chown
 SC_LTTNG_TRACEPOINT_EVENT(chown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)))
 )
 #endif
 #ifndef OVERRIDE_32_getdents64
 SC_LTTNG_TRACEPOINT_EVENT(getdents64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent64 * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent64 *, dirent)) sc_in(__field(unsigned int, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(dirent, dirent)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned int, fd, fd)) sc_out(ctf_integer(struct linux_dirent64 *, dirent, dirent)) sc_in(ctf_integer(unsigned int, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_mincore
 SC_LTTNG_TRACEPOINT_EVENT(mincore,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned char * vec),
        TP_ARGS(sc_exit(ret,) start, len, vec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_out(__field_hex(unsigned char *, vec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(start, start)) sc_in(tp_assign(len, len)) sc_out(tp_assign(vec, vec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, start, start)) sc_in(ctf_integer(size_t, len, len)) sc_out(ctf_integer(unsigned char *, vec, vec)))
 )
 #endif
 #ifndef OVERRIDE_32_listxattr
 SC_LTTNG_TRACEPOINT_EVENT(listxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_llistxattr
 SC_LTTNG_TRACEPOINT_EVENT(llistxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_flistxattr
 SC_LTTNG_TRACEPOINT_EVENT(flistxattr,
        TP_PROTO(sc_exit(long ret,) int fd, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) fd, list, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(list, list)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(char *, list, list)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_setaffinity
 SC_LTTNG_TRACEPOINT_EVENT(sched_setaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_in(__field_hex(unsigned long *, user_mask_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(len, len)) sc_in(tp_assign(user_mask_ptr, user_mask_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, len, len)) sc_in(ctf_integer(unsigned long *, user_mask_ptr, user_mask_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_sched_getaffinity
 SC_LTTNG_TRACEPOINT_EVENT(sched_getaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_out(__field_hex(unsigned long *, user_mask_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(len, len)) sc_out(tp_assign(user_mask_ptr, user_mask_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, len, len)) sc_out(ctf_integer(unsigned long *, user_mask_ptr, user_mask_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_io_submit
 SC_LTTNG_TRACEPOINT_EVENT(io_submit,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long nr, struct iocb * * iocbpp),
        TP_ARGS(sc_exit(ret,) ctx_id, nr, iocbpp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, nr)) sc_in(__field_hex(struct iocb * *, iocbpp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(nr, nr)) sc_in(tp_assign(iocbpp, iocbpp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, nr, nr)) sc_in(ctf_integer(struct iocb * *, iocbpp, iocbpp)))
 )
 #endif
 #ifndef OVERRIDE_32_io_cancel
 SC_LTTNG_TRACEPOINT_EVENT(io_cancel,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, struct iocb * iocb, struct io_event * result),
        TP_ARGS(sc_exit(ret,) ctx_id, iocb, result),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field_hex(struct iocb *, iocb)) sc_out(__field_hex(struct io_event *, result))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(iocb, iocb)) sc_out(tp_assign(result, result))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(struct iocb *, iocb, iocb)) sc_out(ctf_integer(struct io_event *, result, result)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_create
 SC_LTTNG_TRACEPOINT_EVENT(timer_create,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct sigevent * timer_event_spec, timer_t * created_timer_id),
        TP_ARGS(sc_exit(ret,) which_clock, timer_event_spec, created_timer_id),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(struct sigevent *, timer_event_spec)) sc_out(__field_hex(timer_t *, created_timer_id))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(timer_event_spec, timer_event_spec)) sc_out(tp_assign(created_timer_id, created_timer_id))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(struct sigevent *, timer_event_spec, timer_event_spec)) sc_out(ctf_integer(timer_t *, created_timer_id, created_timer_id)))
 )
 #endif
 #ifndef OVERRIDE_32_statfs64
 SC_LTTNG_TRACEPOINT_EVENT(statfs64,
        TP_PROTO(sc_exit(long ret,) const char * pathname, size_t sz, struct statfs64 * buf),
        TP_ARGS(sc_exit(ret,) pathname, sz, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__string_from_user(pathname, pathname)) sc_inout(__field(size_t, sz)) sc_inout(__field_hex(struct statfs64 *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_copy_string_from_user(pathname, pathname)) sc_inout(tp_assign(sz, sz)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_user_string(pathname, pathname)) sc_inout(ctf_integer(size_t, sz, sz)) sc_inout(ctf_integer(struct statfs64 *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatfs64
 SC_LTTNG_TRACEPOINT_EVENT(fstatfs64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, size_t sz, struct statfs64 * buf),
        TP_ARGS(sc_exit(ret,) fd, sz, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(size_t, sz)) sc_inout(__field_hex(struct statfs64 *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(sz, sz)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(size_t, sz, sz)) sc_inout(ctf_integer(struct statfs64 *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_getsetattr
 SC_LTTNG_TRACEPOINT_EVENT(mq_getsetattr,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const struct mq_attr * u_mqstat, struct mq_attr * u_omqstat),
        TP_ARGS(sc_exit(ret,) mqdes, u_mqstat, u_omqstat),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const struct mq_attr *, u_mqstat)) sc_out(__field_hex(struct mq_attr *, u_omqstat))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_in(tp_assign(u_mqstat, u_mqstat)) sc_out(tp_assign(u_omqstat, u_omqstat))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_in(ctf_integer(const struct mq_attr *, u_mqstat, u_mqstat)) sc_out(ctf_integer(struct mq_attr *, u_omqstat, u_omqstat)))
 )
 #endif
 #ifndef OVERRIDE_32_inotify_add_watch
 SC_LTTNG_TRACEPOINT_EVENT(inotify_add_watch,
        TP_PROTO(sc_exit(long ret,) int fd, const char * pathname, u32 mask),
        TP_ARGS(sc_exit(ret,) fd, pathname, mask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(u32, mask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mask, mask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(u32, mask, mask)))
 )
 #endif
 #ifndef OVERRIDE_32_mkdirat
 SC_LTTNG_TRACEPOINT_EVENT(mkdirat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, int mode),
        TP_ARGS(sc_exit(ret,) dfd, pathname, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_futimesat
 SC_LTTNG_TRACEPOINT_EVENT(futimesat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timeval *, utimes, utimes)))
 )
 #endif
 #ifndef OVERRIDE_32_unlinkat
 SC_LTTNG_TRACEPOINT_EVENT(unlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, int flag),
        TP_ARGS(sc_exit(ret,) dfd, pathname, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_symlinkat
 SC_LTTNG_TRACEPOINT_EVENT(symlinkat,
        TP_PROTO(sc_exit(long ret,) const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_fchmodat
 SC_LTTNG_TRACEPOINT_EVENT(fchmodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, mode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(mode_t, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(mode_t, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_faccessat
 SC_LTTNG_TRACEPOINT_EVENT(faccessat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_get_robust_list
 SC_LTTNG_TRACEPOINT_EVENT(get_robust_list,
        TP_PROTO(sc_exit(long ret,) int pid, struct robust_list_head * * head_ptr, size_t * len_ptr),
        TP_ARGS(sc_exit(ret,) pid, head_ptr, len_ptr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, pid)) sc_out(__field_hex(struct robust_list_head * *, head_ptr)) sc_out(__field_hex(size_t *, len_ptr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_out(tp_assign(head_ptr, head_ptr)) sc_out(tp_assign(len_ptr, len_ptr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, pid, pid)) sc_out(ctf_integer(struct robust_list_head * *, head_ptr, head_ptr)) sc_out(ctf_integer(size_t *, len_ptr, len_ptr)))
 )
 #endif
 #ifndef OVERRIDE_32_getcpu
 SC_LTTNG_TRACEPOINT_EVENT(getcpu,
        TP_PROTO(sc_exit(long ret,) unsigned * cpup, unsigned * nodep, struct getcpu_cache * unused),
        TP_ARGS(sc_exit(ret,) cpup, nodep, unused),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(unsigned *, cpup)) sc_out(__field_hex(unsigned *, nodep)) sc_inout(__field_hex(struct getcpu_cache *, unused))),
-       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(unused, unused))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(unsigned *, cpup, cpup)) sc_out(ctf_integer(unsigned *, nodep, nodep)) sc_inout(ctf_integer(struct getcpu_cache *, unused, unused)))
 )
 #endif
 #ifndef OVERRIDE_32_signalfd
 SC_LTTNG_TRACEPOINT_EVENT(signalfd,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)))
 )
 #endif
 #ifndef OVERRIDE_32_bind
 SC_LTTNG_TRACEPOINT_EVENT(bind,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * umyaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, umyaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, umyaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(umyaddr, umyaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, umyaddr, umyaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_connect
 SC_LTTNG_TRACEPOINT_EVENT(connect,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, uservaddr)) sc_in(__field_hex(int, addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(uservaddr, uservaddr)) sc_in(tp_assign(addrlen, addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct sockaddr *, uservaddr, uservaddr)) sc_in(ctf_integer(int, addrlen, addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_accept
 SC_LTTNG_TRACEPOINT_EVENT(accept,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)))
 )
 #endif
 #ifndef OVERRIDE_32_getsockname
 SC_LTTNG_TRACEPOINT_EVENT(getsockname,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_getpeername
 SC_LTTNG_TRACEPOINT_EVENT(getpeername,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(usockaddr, usockaddr)) sc_inout(tp_assign(usockaddr_len, usockaddr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, usockaddr, usockaddr)) sc_inout(ctf_integer(int *, usockaddr_len, usockaddr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_sendmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_recvmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_inout(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_inout(tp_assign(msg, msg)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(struct msghdr *, msg, msg)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_reboot
 SC_LTTNG_TRACEPOINT_EVENT(reboot,
        TP_PROTO(sc_exit(long ret,) int magic1, int magic2, unsigned int cmd, void * arg),
        TP_ARGS(sc_exit(ret,) magic1, magic2, cmd, arg),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, magic1)) sc_in(__field(int, magic2)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(void *, arg))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(magic1, magic1)) sc_in(tp_assign(magic2, magic2)) sc_in(tp_assign(cmd, cmd)) sc_in(tp_assign(arg, arg))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, magic1, magic1)) sc_in(ctf_integer(int, magic2, magic2)) sc_in(ctf_integer(unsigned int, cmd, cmd)) sc_in(ctf_integer(void *, arg, arg)))
 )
 #endif
 #ifndef OVERRIDE_32_wait4
 SC_LTTNG_TRACEPOINT_EVENT(wait4,
        TP_PROTO(sc_exit(long ret,) pid_t upid, int * stat_addr, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) upid, stat_addr, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(int *, stat_addr)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(stat_addr, stat_addr)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(int *, stat_addr, stat_addr)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigaction
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction * act, struct sigaction * oact, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) sig, act, oact, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, sig)) sc_in(__field_hex(const struct sigaction *, act)) sc_out(__field_hex(struct sigaction *, oact)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(act, act)) sc_out(tp_assign(oact, oact)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(const struct sigaction *, act, act)) sc_out(ctf_integer(struct sigaction *, oact, oact)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigprocmask
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, sigset_t * nset, sigset_t * oset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) how, nset, oset, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, how)) sc_in(__field_hex(sigset_t *, nset)) sc_out(__field_hex(sigset_t *, oset)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(how, how)) sc_in(tp_assign(nset, nset)) sc_out(tp_assign(oset, oset)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, how, how)) sc_in(ctf_integer(sigset_t *, nset, nset)) sc_out(ctf_integer(sigset_t *, oset, oset)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_sigtimedwait
 SC_LTTNG_TRACEPOINT_EVENT(rt_sigtimedwait,
        TP_PROTO(sc_exit(long ret,) const sigset_t * uthese, siginfo_t * uinfo, const struct timespec * uts, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uthese, uinfo, uts, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(const sigset_t *, uthese)) sc_out(__field_hex(siginfo_t *, uinfo)) sc_in(__field_hex(const struct timespec *, uts)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_out(tp_assign(uthese, uthese)) sc_out(tp_assign(uinfo, uinfo)) sc_in(tp_assign(uts, uts)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_out(ctf_integer(const sigset_t *, uthese, uthese)) sc_out(ctf_integer(siginfo_t *, uinfo, uinfo)) sc_in(ctf_integer(const struct timespec *, uts, uts)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_sendfile
 SC_LTTNG_TRACEPOINT_EVENT(sendfile,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, off_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, out_fd)) sc_inout(__field(int, in_fd)) sc_inout(__field_hex(off_t *, offset)) sc_inout(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(out_fd, out_fd)) sc_inout(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_inout(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, out_fd, out_fd)) sc_inout(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(off_t *, offset, offset)) sc_inout(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_getxattr
 SC_LTTNG_TRACEPOINT_EVENT(getxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_lgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lgetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_fgetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fgetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) fd, name, value, size),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_out(tp_assign(value, value)) sc_in(tp_assign(size, size))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_out(ctf_integer(void *, value, value)) sc_in(ctf_integer(size_t, size, size)))
 )
 #endif
 #ifndef OVERRIDE_32_sendfile64
 SC_LTTNG_TRACEPOINT_EVENT(sendfile64,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, loff_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, out_fd)) sc_in(__field(int, in_fd)) sc_inout(__field_hex(loff_t *, offset)) sc_in(__field(size_t, count))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(out_fd, out_fd)) sc_in(tp_assign(in_fd, in_fd)) sc_inout(tp_assign(offset, offset)) sc_in(tp_assign(count, count))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, out_fd, out_fd)) sc_in(ctf_integer(int, in_fd, in_fd)) sc_inout(ctf_integer(loff_t *, offset, offset)) sc_in(ctf_integer(size_t, count, count)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_ctl
 SC_LTTNG_TRACEPOINT_EVENT(epoll_ctl,
        TP_PROTO(sc_exit(long ret,) int epfd, int op, int fd, struct epoll_event * event),
        TP_ARGS(sc_exit(ret,) epfd, op, fd, event),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_in(__field(int, op)) sc_in(__field(int, fd)) sc_in(__field_hex(struct epoll_event *, event))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_in(tp_assign(op, op)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(event, event))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct epoll_event *, event, event)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_wait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_wait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_timer_settime
 SC_LTTNG_TRACEPOINT_EVENT(timer_settime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, int flags, const struct itimerspec * new_setting, struct itimerspec * old_setting),
        TP_ARGS(sc_exit(ret,) timer_id, flags, new_setting, old_setting),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, new_setting)) sc_out(__field_hex(struct itimerspec *, old_setting))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(timer_id, timer_id)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(new_setting, new_setting)) sc_out(tp_assign(old_setting, old_setting))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(timer_t, timer_id, timer_id)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, new_setting, new_setting)) sc_out(ctf_integer(struct itimerspec *, old_setting, old_setting)))
 )
 #endif
 #ifndef OVERRIDE_32_clock_nanosleep
 SC_LTTNG_TRACEPOINT_EVENT(clock_nanosleep,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, int flags, const struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) which_clock, flags, rqtp, rmtp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which_clock, which_clock)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(rqtp, rqtp)) sc_out(tp_assign(rmtp, rmtp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(const clockid_t, which_clock, which_clock)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct timespec *, rqtp, rqtp)) sc_out(ctf_integer(struct timespec *, rmtp, rmtp)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_open
 SC_LTTNG_TRACEPOINT_EVENT(mq_open,
        TP_PROTO(sc_exit(long ret,) const char * u_name, int oflag, mode_t mode, struct mq_attr * u_attr),
        TP_ARGS(sc_exit(ret,) u_name, oflag, mode, u_attr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(u_name, u_name)) sc_in(__field(int, oflag)) sc_in(__field(mode_t, mode)) sc_in(__field_hex(struct mq_attr *, u_attr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(u_name, u_name)) sc_in(tp_assign(oflag, oflag)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(u_attr, u_attr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(u_name, u_name)) sc_in(ctf_integer(int, oflag, oflag)) sc_in(ctf_integer(mode_t, mode, mode)) sc_in(ctf_integer(struct mq_attr *, u_attr, u_attr)))
 )
 #endif
 #ifndef OVERRIDE_32_request_key
 SC_LTTNG_TRACEPOINT_EVENT(request_key,
        TP_PROTO(sc_exit(long ret,) const char * _type, const char * _description, const char * _callout_info, key_serial_t destringid),
        TP_ARGS(sc_exit(ret,) _type, _description, _callout_info, destringid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(_type, _type)) sc_in(__field_hex(const char *, _description)) sc_in(__field_hex(const char *, _callout_info)) sc_in(__field(key_serial_t, destringid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(_type, _type)) sc_in(tp_assign(_description, _description)) sc_in(tp_assign(_callout_info, _callout_info)) sc_in(tp_assign(destringid, destringid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(_type, _type)) sc_in(ctf_integer(const char *, _description, _description)) sc_in(ctf_integer(const char *, _callout_info, _callout_info)) sc_in(ctf_integer(key_serial_t, destringid, destringid)))
 )
 #endif
 #ifndef OVERRIDE_32_vmsplice
 SC_LTTNG_TRACEPOINT_EVENT(vmsplice,
        TP_PROTO(sc_exit(long ret,) int fd, const struct iovec * iov, unsigned long nr_segs, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, iov, nr_segs, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(const struct iovec *, iov)) sc_in(__field(unsigned long, nr_segs)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(iov, iov)) sc_in(tp_assign(nr_segs, nr_segs)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(const struct iovec *, iov, iov)) sc_in(ctf_integer(unsigned long, nr_segs, nr_segs)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_openat
 SC_LTTNG_TRACEPOINT_EVENT(openat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int flags, int mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, flags, mode),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(int, mode))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(mode, mode))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(int, mode, mode)))
 )
 #endif
 #ifndef OVERRIDE_32_mknodat
 SC_LTTNG_TRACEPOINT_EVENT(mknodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode, dev),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode)) sc_in(__field(unsigned, dev))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(mode, mode)) sc_in(tp_assign(dev, dev))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(int, mode, mode)) sc_in(ctf_integer(unsigned, dev, dev)))
 )
 #endif
 #ifndef OVERRIDE_32_fstatat64
 SC_LTTNG_TRACEPOINT_EVENT(fstatat64,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct stat64 * statbuf, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, statbuf, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, dfd)) sc_inout(__string_from_user(filename, filename)) sc_inout(__field_hex(struct stat64 *, statbuf)) sc_inout(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(dfd, dfd)) sc_inout(tp_copy_string_from_user(filename, filename)) sc_inout(tp_assign(statbuf, statbuf)) sc_inout(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, dfd, dfd)) sc_inout(ctf_user_string(filename, filename)) sc_inout(ctf_integer(struct stat64 *, statbuf, statbuf)) sc_inout(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_renameat
 SC_LTTNG_TRACEPOINT_EVENT(renameat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)))
 )
 #endif
 #ifndef OVERRIDE_32_readlinkat
 SC_LTTNG_TRACEPOINT_EVENT(readlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) dfd, pathname, buf, bufsiz),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_out(tp_assign(buf, buf)) sc_in(tp_assign(bufsiz, bufsiz))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(pathname, pathname)) sc_out(ctf_integer(char *, buf, buf)) sc_in(ctf_integer(int, bufsiz, bufsiz)))
 )
 #endif
 #ifndef OVERRIDE_32_utimensat
 SC_LTTNG_TRACEPOINT_EVENT(utimensat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timespec * utimes, int flags),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timespec *, utimes)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(utimes, utimes)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(struct timespec *, utimes, utimes)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_timerfd_settime
 SC_LTTNG_TRACEPOINT_EVENT(timerfd_settime,
        TP_PROTO(sc_exit(long ret,) int ufd, int flags, const struct itimerspec * utmr, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, flags, utmr, otmr),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, utmr)) sc_out(__field_hex(struct itimerspec *, otmr))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(utmr, utmr)) sc_out(tp_assign(otmr, otmr))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(int, flags, flags)) sc_in(ctf_integer(const struct itimerspec *, utmr, utmr)) sc_out(ctf_integer(struct itimerspec *, otmr, otmr)))
 )
 #endif
 #ifndef OVERRIDE_32_signalfd4
 SC_LTTNG_TRACEPOINT_EVENT(signalfd4,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask, int flags),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ufd, ufd)) sc_in(tp_assign(user_mask, user_mask)) sc_in(tp_assign(sizemask, sizemask)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, ufd, ufd)) sc_in(ctf_integer(sigset_t *, user_mask, user_mask)) sc_in(ctf_integer(size_t, sizemask, sizemask)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_rt_tgsigqueueinfo
 SC_LTTNG_TRACEPOINT_EVENT(rt_tgsigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig, uinfo),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(tgid, tgid)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(sig, sig)) sc_in(tp_assign(uinfo, uinfo))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, tgid, tgid)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, sig, sig)) sc_in(ctf_integer(siginfo_t *, uinfo, uinfo)))
 )
 #endif
 #ifndef OVERRIDE_32_prlimit64
 SC_LTTNG_TRACEPOINT_EVENT(prlimit64,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int resource, const struct rlimit64 * new_rlim, struct rlimit64 * old_rlim),
        TP_ARGS(sc_exit(ret,) pid, resource, new_rlim, old_rlim),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(const struct rlimit64 *, new_rlim)) sc_out(__field_hex(struct rlimit64 *, old_rlim))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(resource, resource)) sc_in(tp_assign(new_rlim, new_rlim)) sc_out(tp_assign(old_rlim, old_rlim))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(unsigned int, resource, resource)) sc_in(ctf_integer(const struct rlimit64 *, new_rlim, new_rlim)) sc_out(ctf_integer(struct rlimit64 *, old_rlim, old_rlim)))
 )
 #endif
 #ifndef OVERRIDE_32_socketpair
 SC_LTTNG_TRACEPOINT_EVENT(socketpair,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol, int * usockvec),
        TP_ARGS(sc_exit(ret,) family, type, protocol, usockvec),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol)) sc_out(__field_hex(int *, usockvec))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(family, family)) sc_in(tp_assign(type, type)) sc_in(tp_assign(protocol, protocol)) sc_out(tp_assign(usockvec, usockvec))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, family, family)) sc_in(ctf_integer(int, type, type)) sc_in(ctf_integer(int, protocol, protocol)) sc_out(ctf_integer(int *, usockvec, usockvec)))
 )
 #endif
 #ifndef OVERRIDE_32_send
 SC_LTTNG_TRACEPOINT_EVENT(send,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned flags),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(int, fd)) sc_inout(__field_hex(void *, buff)) sc_inout(__field(size_t, len)) sc_inout(__field(unsigned, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(buff, buff)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(int, fd, fd)) sc_inout(ctf_integer(void *, buff, buff)) sc_inout(ctf_integer(size_t, len, len)) sc_inout(ctf_integer(unsigned, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_accept4
 SC_LTTNG_TRACEPOINT_EVENT(accept4,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen, int flags),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(upeer_sockaddr, upeer_sockaddr)) sc_inout(tp_assign(upeer_addrlen, upeer_addrlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct sockaddr *, upeer_sockaddr, upeer_sockaddr)) sc_inout(ctf_integer(int *, upeer_addrlen, upeer_addrlen)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_sendmmsg
 SC_LTTNG_TRACEPOINT_EVENT(sendmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_mount
 SC_LTTNG_TRACEPOINT_EVENT(mount,
        TP_PROTO(sc_exit(long ret,) char * dev_name, char * dir_name, char * type, unsigned long flags, void * data),
        TP_ARGS(sc_exit(ret,) dev_name, dir_name, type, flags, data),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(dev_name, dev_name)) sc_in(__string_from_user(dir_name, dir_name)) sc_in(__string_from_user(type, type)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(void *, data))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(dev_name, dev_name)) sc_in(tp_copy_string_from_user(dir_name, dir_name)) sc_in(tp_copy_string_from_user(type, type)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(data, data))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(dev_name, dev_name)) sc_in(ctf_user_string(dir_name, dir_name)) sc_in(ctf_user_string(type, type)) sc_in(ctf_integer(unsigned long, flags, flags)) sc_in(ctf_integer(void *, data, data)))
 )
 #endif                                                                                                                                                                                       
 #ifndef OVERRIDE_32_llseek
 SC_LTTNG_TRACEPOINT_EVENT(llseek,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned long offset_high, unsigned long offset_low, loff_t * result, unsigned int origin),
        TP_ARGS(sc_exit(ret,) fd, offset_high, offset_low, result, origin),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, fd)) sc_inout(__field(unsigned long, offset_high)) sc_inout(__field(unsigned long, offset_low)) sc_inout(__field_hex(loff_t *, result)) sc_inout(__field(unsigned int, origin))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(fd, fd)) sc_inout(tp_assign(offset_high, offset_high)) sc_inout(tp_assign(offset_low, offset_low)) sc_inout(tp_assign(result, result)) sc_inout(tp_assign(origin, origin))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, fd, fd)) sc_inout(ctf_integer(unsigned long, offset_high, offset_high)) sc_inout(ctf_integer(unsigned long, offset_low, offset_low)) sc_inout(ctf_integer(loff_t *, result, result)) sc_inout(ctf_integer(unsigned int, origin, origin)))
 )
 #endif
 #ifndef OVERRIDE_32_select
 SC_LTTNG_TRACEPOINT_EVENT(select,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timeval * tvp),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tvp),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timeval *, tvp))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tvp, tvp))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timeval *, tvp, tvp)))
 )
 #endif
 #ifndef OVERRIDE_32_pciconfig_read
 SC_LTTNG_TRACEPOINT_EVENT(pciconfig_read,
        TP_PROTO(sc_exit(long ret,) unsigned long bus, unsigned long dfn, unsigned long off, unsigned long len, void * buf),
        TP_ARGS(sc_exit(ret,) bus, dfn, off, len, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, bus)) sc_inout(__field(unsigned long, dfn)) sc_inout(__field(unsigned long, off)) sc_inout(__field(unsigned long, len)) sc_inout(__field_hex(void *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(bus, bus)) sc_inout(tp_assign(dfn, dfn)) sc_inout(tp_assign(off, off)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, bus, bus)) sc_inout(ctf_integer(unsigned long, dfn, dfn)) sc_inout(ctf_integer(unsigned long, off, off)) sc_inout(ctf_integer(unsigned long, len, len)) sc_inout(ctf_integer(void *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_pciconfig_write
 SC_LTTNG_TRACEPOINT_EVENT(pciconfig_write,
        TP_PROTO(sc_exit(long ret,) unsigned long bus, unsigned long dfn, unsigned long off, unsigned long len, void * buf),
        TP_ARGS(sc_exit(ret,) bus, dfn, off, len, buf),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned long, bus)) sc_inout(__field(unsigned long, dfn)) sc_inout(__field(unsigned long, off)) sc_inout(__field(unsigned long, len)) sc_inout(__field_hex(void *, buf))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(bus, bus)) sc_inout(tp_assign(dfn, dfn)) sc_inout(tp_assign(off, off)) sc_inout(tp_assign(len, len)) sc_inout(tp_assign(buf, buf))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned long, bus, bus)) sc_inout(ctf_integer(unsigned long, dfn, dfn)) sc_inout(ctf_integer(unsigned long, off, off)) sc_inout(ctf_integer(unsigned long, len, len)) sc_inout(ctf_integer(void *, buf, buf)))
 )
 #endif
 #ifndef OVERRIDE_32_setxattr
 SC_LTTNG_TRACEPOINT_EVENT(setxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_lsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(lsetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(pathname, pathname)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(pathname, pathname)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_fsetxattr
 SC_LTTNG_TRACEPOINT_EVENT(fsetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) fd, name, value, size, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_copy_string_from_user(name, name)) sc_in(tp_assign(value, value)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_user_string(name, name)) sc_in(ctf_integer(const void *, value, value)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_io_getevents
 SC_LTTNG_TRACEPOINT_EVENT(io_getevents,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long min_nr, long nr, struct io_event * events, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) ctx_id, min_nr, nr, events, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, min_nr)) sc_in(__field(long, nr)) sc_out(__field_hex(struct io_event *, events)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(ctx_id, ctx_id)) sc_in(tp_assign(min_nr, min_nr)) sc_in(tp_assign(nr, nr)) sc_out(tp_assign(events, events)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(aio_context_t, ctx_id, ctx_id)) sc_in(ctf_integer(long, min_nr, min_nr)) sc_in(ctf_integer(long, nr, nr)) sc_out(ctf_integer(struct io_event *, events, events)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_timedsend
 SC_LTTNG_TRACEPOINT_EVENT(mq_timedsend,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const char * u_msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec * u_abs_timeout),
        TP_ARGS(sc_exit(ret,) mqdes, u_msg_ptr, msg_len, msg_prio, u_abs_timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const char *, u_msg_ptr)) sc_in(__field(size_t, msg_len)) sc_in(__field(unsigned int, msg_prio)) sc_in(__field_hex(const struct timespec *, u_abs_timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_in(tp_assign(u_msg_ptr, u_msg_ptr)) sc_in(tp_assign(msg_len, msg_len)) sc_in(tp_assign(msg_prio, msg_prio)) sc_in(tp_assign(u_abs_timeout, u_abs_timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_in(ctf_integer(const char *, u_msg_ptr, u_msg_ptr)) sc_in(ctf_integer(size_t, msg_len, msg_len)) sc_in(ctf_integer(unsigned int, msg_prio, msg_prio)) sc_in(ctf_integer(const struct timespec *, u_abs_timeout, u_abs_timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_mq_timedreceive
 SC_LTTNG_TRACEPOINT_EVENT(mq_timedreceive,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, char * u_msg_ptr, size_t msg_len, unsigned int * u_msg_prio, const struct timespec * u_abs_timeout),
        TP_ARGS(sc_exit(ret,) mqdes, u_msg_ptr, msg_len, u_msg_prio, u_abs_timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_out(__field_hex(char *, u_msg_ptr)) sc_in(__field(size_t, msg_len)) sc_out(__field_hex(unsigned int *, u_msg_prio)) sc_in(__field_hex(const struct timespec *, u_abs_timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(mqdes, mqdes)) sc_out(tp_assign(u_msg_ptr, u_msg_ptr)) sc_in(tp_assign(msg_len, msg_len)) sc_out(tp_assign(u_msg_prio, u_msg_prio)) sc_in(tp_assign(u_abs_timeout, u_abs_timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(mqd_t, mqdes, mqdes)) sc_out(ctf_integer(char *, u_msg_ptr, u_msg_ptr)) sc_in(ctf_integer(size_t, msg_len, msg_len)) sc_out(ctf_integer(unsigned int *, u_msg_prio, u_msg_prio)) sc_in(ctf_integer(const struct timespec *, u_abs_timeout, u_abs_timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_add_key
 SC_LTTNG_TRACEPOINT_EVENT(add_key,
        TP_PROTO(sc_exit(long ret,) const char * _type, const char * _description, const void * _payload, size_t plen, key_serial_t ringid),
        TP_ARGS(sc_exit(ret,) _type, _description, _payload, plen, ringid),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(_type, _type)) sc_in(__field_hex(const char *, _description)) sc_in(__field_hex(const void *, _payload)) sc_in(__field(size_t, plen)) sc_in(__field(key_serial_t, ringid))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_copy_string_from_user(_type, _type)) sc_in(tp_assign(_description, _description)) sc_in(tp_assign(_payload, _payload)) sc_in(tp_assign(plen, plen)) sc_in(tp_assign(ringid, ringid))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_user_string(_type, _type)) sc_in(ctf_integer(const char *, _description, _description)) sc_in(ctf_integer(const void *, _payload, _payload)) sc_in(ctf_integer(size_t, plen, plen)) sc_in(ctf_integer(key_serial_t, ringid, ringid)))
 )
 #endif
 #ifndef OVERRIDE_32_waitid
 SC_LTTNG_TRACEPOINT_EVENT(waitid,
        TP_PROTO(sc_exit(long ret,) int which, pid_t upid, struct siginfo * infop, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) which, upid, infop, options, ru),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(struct siginfo *, infop)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(which, which)) sc_in(tp_assign(upid, upid)) sc_out(tp_assign(infop, infop)) sc_in(tp_assign(options, options)) sc_out(tp_assign(ru, ru))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, which, which)) sc_in(ctf_integer(pid_t, upid, upid)) sc_out(ctf_integer(struct siginfo *, infop, infop)) sc_in(ctf_integer(int, options, options)) sc_out(ctf_integer(struct rusage *, ru, ru)))
 )
 #endif
 #ifndef OVERRIDE_32_ppoll
 SC_LTTNG_TRACEPOINT_EVENT(ppoll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, struct timespec * tsp, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) ufds, nfds, tsp, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(ufds, ufds)) sc_in(tp_assign(nfds, nfds)) sc_in(tp_assign(tsp, tsp)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(struct pollfd *, ufds, ufds)) sc_in(ctf_integer(unsigned int, nfds, nfds)) sc_in(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_fchownat
 SC_LTTNG_TRACEPOINT_EVENT(fchownat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, uid_t user, gid_t group, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, user, group, flag),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group)) sc_in(__field(int, flag))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(dfd, dfd)) sc_in(tp_copy_string_from_user(filename, filename)) sc_in(tp_assign(user, user)) sc_in(tp_assign(group, group)) sc_in(tp_assign(flag, flag))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, dfd, dfd)) sc_in(ctf_user_string(filename, filename)) sc_in(ctf_integer(uid_t, user, user)) sc_in(ctf_integer(gid_t, group, group)) sc_in(ctf_integer(int, flag, flag)))
 )
 #endif
 #ifndef OVERRIDE_32_linkat
 SC_LTTNG_TRACEPOINT_EVENT(linkat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname, int flags),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname)) sc_in(__field(int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(olddfd, olddfd)) sc_in(tp_copy_string_from_user(oldname, oldname)) sc_in(tp_assign(newdfd, newdfd)) sc_in(tp_copy_string_from_user(newname, newname)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, olddfd, olddfd)) sc_in(ctf_user_string(oldname, oldname)) sc_in(ctf_integer(int, newdfd, newdfd)) sc_in(ctf_user_string(newname, newname)) sc_in(ctf_integer(int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_perf_event_open
 SC_LTTNG_TRACEPOINT_EVENT(perf_event_open,
        TP_PROTO(sc_exit(long ret,) struct perf_event_attr * attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags),
        TP_ARGS(sc_exit(ret,) attr_uptr, pid, cpu, group_fd, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct perf_event_attr *, attr_uptr)) sc_in(__field(pid_t, pid)) sc_in(__field(int, cpu)) sc_in(__field(int, group_fd)) sc_in(__field(unsigned long, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(attr_uptr, attr_uptr)) sc_in(tp_assign(pid, pid)) sc_in(tp_assign(cpu, cpu)) sc_in(tp_assign(group_fd, group_fd)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(struct perf_event_attr *, attr_uptr, attr_uptr)) sc_in(ctf_integer(pid_t, pid, pid)) sc_in(ctf_integer(int, cpu, cpu)) sc_in(ctf_integer(int, group_fd, group_fd)) sc_in(ctf_integer(unsigned long, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_preadv
 SC_LTTNG_TRACEPOINT_EVENT(preadv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_out(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_out(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_32_pwritev
 SC_LTTNG_TRACEPOINT_EVENT(pwritev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_in(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(vec, vec)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(pos_l, pos_l)) sc_in(tp_assign(pos_h, pos_h))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(unsigned long, fd, fd)) sc_in(ctf_integer(const struct iovec *, vec, vec)) sc_in(ctf_integer(unsigned long, vlen, vlen)) sc_in(ctf_integer(unsigned long, pos_l, pos_l)) sc_in(ctf_integer(unsigned long, pos_h, pos_h)))
 )
 #endif
 #ifndef OVERRIDE_32_setsockopt
 SC_LTTNG_TRACEPOINT_EVENT(setsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_in(__field_hex(char *, optval)) sc_in(__field(int, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_in(tp_assign(optval, optval)) sc_in(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_in(ctf_integer(char *, optval, optval)) sc_in(ctf_integer(int, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_32_getsockopt
 SC_LTTNG_TRACEPOINT_EVENT(getsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int * optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_out(__field_hex(char *, optval)) sc_inout(__field_hex(int *, optlen))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(level, level)) sc_in(tp_assign(optname, optname)) sc_out(tp_assign(optval, optval)) sc_inout(tp_assign(optlen, optlen))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(int, level, level)) sc_in(ctf_integer(int, optname, optname)) sc_out(ctf_integer(char *, optval, optval)) sc_inout(ctf_integer(int *, optlen, optlen)))
 )
 #endif
 #ifndef OVERRIDE_32_recvmmsg
 SC_LTTNG_TRACEPOINT_EVENT(recvmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags, timeout),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags)) sc_inout(__field_hex(struct timespec *, timeout))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(mmsg, mmsg)) sc_in(tp_assign(vlen, vlen)) sc_in(tp_assign(flags, flags)) sc_inout(tp_assign(timeout, timeout))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(struct mmsghdr *, mmsg, mmsg)) sc_in(ctf_integer(unsigned int, vlen, vlen)) sc_in(ctf_integer(unsigned int, flags, flags)) sc_inout(ctf_integer(struct timespec *, timeout, timeout)))
 )
 #endif
 #ifndef OVERRIDE_32_ipc
 SC_LTTNG_TRACEPOINT_EVENT(ipc,
        TP_PROTO(sc_exit(long ret,) unsigned int call, int first, unsigned long second, unsigned long third, void * ptr, long fifth),
        TP_ARGS(sc_exit(ret,) call, first, second, third, ptr, fifth),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field(unsigned int, call)) sc_inout(__field(int, first)) sc_inout(__field(unsigned long, second)) sc_inout(__field(unsigned long, third)) sc_inout(__field_hex(void *, ptr)) sc_inout(__field(long, fifth))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(call, call)) sc_inout(tp_assign(first, first)) sc_inout(tp_assign(second, second)) sc_inout(tp_assign(third, third)) sc_inout(tp_assign(ptr, ptr)) sc_inout(tp_assign(fifth, fifth))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(unsigned int, call, call)) sc_inout(ctf_integer(int, first, first)) sc_inout(ctf_integer(unsigned long, second, second)) sc_inout(ctf_integer(unsigned long, third, third)) sc_inout(ctf_integer(void *, ptr, ptr)) sc_inout(ctf_integer(long, fifth, fifth)))
 )
 #endif
 #ifndef OVERRIDE_32_futex
 SC_LTTNG_TRACEPOINT_EVENT(futex,
        TP_PROTO(sc_exit(long ret,) u32 * uaddr, int op, u32 val, struct timespec * utime, u32 * uaddr2, u32 val3),
        TP_ARGS(sc_exit(ret,) uaddr, op, val, utime, uaddr2, val3),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(u32 *, uaddr)) sc_in(__field(int, op)) sc_in(__field(u32, val)) sc_in(__field_hex(struct timespec *, utime)) sc_inout(__field_hex(u32 *, uaddr2)) sc_in(__field(u32, val3))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_inout(tp_assign(uaddr, uaddr)) sc_in(tp_assign(op, op)) sc_in(tp_assign(val, val)) sc_in(tp_assign(utime, utime)) sc_inout(tp_assign(uaddr2, uaddr2)) sc_in(tp_assign(val3, val3))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_inout(ctf_integer(u32 *, uaddr, uaddr)) sc_in(ctf_integer(int, op, op)) sc_in(ctf_integer(u32, val, val)) sc_in(ctf_integer(struct timespec *, utime, utime)) sc_inout(ctf_integer(u32 *, uaddr2, uaddr2)) sc_in(ctf_integer(u32, val3, val3)))
 )
 #endif
 #ifndef OVERRIDE_32_pselect6
 SC_LTTNG_TRACEPOINT_EVENT(pselect6,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timespec * tsp, void * sig),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tsp, sig),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(void *, sig))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(n, n)) sc_inout(tp_assign(inp, inp)) sc_inout(tp_assign(outp, outp)) sc_inout(tp_assign(exp, exp)) sc_inout(tp_assign(tsp, tsp)) sc_in(tp_assign(sig, sig))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, n, n)) sc_inout(ctf_integer(fd_set *, inp, inp)) sc_inout(ctf_integer(fd_set *, outp, outp)) sc_inout(ctf_integer(fd_set *, exp, exp)) sc_inout(ctf_integer(struct timespec *, tsp, tsp)) sc_in(ctf_integer(void *, sig, sig)))
 )
 #endif
 #ifndef OVERRIDE_32_splice
 SC_LTTNG_TRACEPOINT_EVENT(splice,
        TP_PROTO(sc_exit(long ret,) int fd_in, loff_t * off_in, int fd_out, loff_t * off_out, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd_in, off_in, fd_out, off_out, len, flags),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd_in)) sc_in(__field_hex(loff_t *, off_in)) sc_in(__field(int, fd_out)) sc_in(__field_hex(loff_t *, off_out)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd_in, fd_in)) sc_in(tp_assign(off_in, off_in)) sc_in(tp_assign(fd_out, fd_out)) sc_in(tp_assign(off_out, off_out)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd_in, fd_in)) sc_in(ctf_integer(loff_t *, off_in, off_in)) sc_in(ctf_integer(int, fd_out, fd_out)) sc_in(ctf_integer(loff_t *, off_out, off_out)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned int, flags, flags)))
 )
 #endif
 #ifndef OVERRIDE_32_epoll_pwait
 SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout, sigmask, sigsetsize),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(epfd, epfd)) sc_out(tp_assign(events, events)) sc_in(tp_assign(maxevents, maxevents)) sc_in(tp_assign(timeout, timeout)) sc_in(tp_assign(sigmask, sigmask)) sc_in(tp_assign(sigsetsize, sigsetsize))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, epfd, epfd)) sc_out(ctf_integer(struct epoll_event *, events, events)) sc_in(ctf_integer(int, maxevents, maxevents)) sc_in(ctf_integer(int, timeout, timeout)) sc_in(ctf_integer(const sigset_t *, sigmask, sigmask)) sc_in(ctf_integer(size_t, sigsetsize, sigsetsize)))
 )
 #endif
 #ifndef OVERRIDE_32_sendto
 SC_LTTNG_TRACEPOINT_EVENT(sendto,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned flags, struct sockaddr * addr, int addr_len),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(void *, buff)) sc_in(__field(size_t, len)) sc_in(__field(unsigned, flags)) sc_in(__field_hex(struct sockaddr *, addr)) sc_in(__field_hex(int, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_in(tp_assign(buff, buff)) sc_in(tp_assign(len, len)) sc_in(tp_assign(flags, flags)) sc_in(tp_assign(addr, addr)) sc_in(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_in(ctf_integer(void *, buff, buff)) sc_in(ctf_integer(size_t, len, len)) sc_in(ctf_integer(unsigned, flags, flags)) sc_in(ctf_integer(struct sockaddr *, addr, addr)) sc_in(ctf_integer(int, addr_len, addr_len)))
 )
 #endif
 #ifndef OVERRIDE_32_recvfrom
 SC_LTTNG_TRACEPOINT_EVENT(recvfrom,
        TP_PROTO(sc_exit(long ret,) int fd, void * ubuf, size_t size, unsigned flags, struct sockaddr * addr, int * addr_len),
        TP_ARGS(sc_exit(ret,) fd, ubuf, size, flags, addr, addr_len),
-       TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(void *, ubuf)) sc_in(__field(size_t, size)) sc_in(__field(unsigned, flags)) sc_out(__field_hex(struct sockaddr *, addr)) sc_inout(__field_hex(int *, addr_len))),
-       TP_fast_assign(sc_exit(tp_assign(ret, ret)) sc_in(tp_assign(fd, fd)) sc_out(tp_assign(ubuf, ubuf)) sc_in(tp_assign(size, size)) sc_in(tp_assign(flags, flags)) sc_out(tp_assign(addr, addr)) sc_inout(tp_assign(addr_len, addr_len))),
-       TP_printk()
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) sc_in(ctf_integer(int, fd, fd)) sc_out(ctf_integer(void *, ubuf, ubuf)) sc_in(ctf_integer(size_t, size, size)) sc_in(ctf_integer(unsigned, flags, flags)) sc_out(ctf_integer(struct sockaddr *, addr, addr)) sc_inout(ctf_integer(int *, addr_len, addr_len)))
 )
 #endif
 

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 94b22fb3bc0bbd2bd15dc2a9a106aed48e3b9bfd..b9e83bc4cf1581afc3215e3105b65618e781498f 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
@@ -6,21 +6,14 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap2,
        TP_PROTO(void *addr, size_t len, int prot,
                  int flags, int fd, off_t pgoff),
        TP_ARGS(addr, len, prot, flags, fd, pgoff),
-       TP_STRUCT__entry(
-               __field_hex(void *, addr)
-               __field(size_t, len)
-               __field(int, prot)
-               __field(int, flags)
-               __field(int, fd)
-               __field(off_t, pgoff)),
-       TP_fast_assign(
-               tp_assign(addr, addr)
-               tp_assign(len, len)
-               tp_assign(prot, prot)
-               tp_assign(flags, flags)
-               tp_assign(fd, fd)
-               tp_assign(pgoff, pgoff)),
-       TP_printk()
+       TP_FIELDS(
+               ctf_integer_hex(void *, addr, addr)
+               ctf_integer(size_t, len, len)
+               ctf_integer(int, prot, prot)
+               ctf_integer(int, flags, flags)
+               ctf_integer(int, fd, fd)
+               ctf_integer(off_t, pgoff, pgoff)
+       )
 )
 
 #else  /* CREATE_SYSCALL_TABLE */