X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Flttng-statedump.h;h=ed43dfb3e051106765675eace7ac5a4430e4bafe;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=b65a1c2594e41b66f787d49f21806a752d61bd01;hpb=d2a927acb6018b445a2b254b7aa11e63acb77858;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h index b65a1c25..ed43dfb3 100644 --- a/instrumentation/events/lttng-module/lttng-statedump.h +++ b/instrumentation/events/lttng-module/lttng-statedump.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -40,8 +40,9 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_end, LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state, TP_PROTO(struct lttng_session *session, struct task_struct *p, - int type, int mode, int submode, int status), - TP_ARGS(session, p, type, mode, submode, status), + int type, int mode, int submode, int status, + struct files_struct *files), + TP_ARGS(session, p, type, mode, submode, status, files), TP_FIELDS( ctf_integer(pid_t, tid, p->pid) ctf_integer(pid_t, pid, p->tgid) @@ -60,10 +61,11 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state, ctf_integer(int, submode, submode) ctf_integer(int, status, status) ctf_integer(unsigned int, cpu, task_cpu(p)) + ctf_integer_hex(struct files_struct *, file_table_address, files) ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0)) LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_cgroup_ns, TP_PROTO(struct lttng_session *session, struct task_struct *p, @@ -83,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_ipc_ns, TP_ARGS(session, p, ipc_ns), TP_FIELDS( ctf_integer(pid_t, tid, p->pid) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->lttng_ns_inum : 0) #endif ) @@ -97,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_mnt_ns, TP_ARGS(session, p, mnt_ns), TP_FIELDS( ctf_integer(pid_t, tid, p->pid) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->lttng_ns_inum : 0) #endif ) @@ -111,7 +113,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_net_ns, TP_ARGS(session, p, net_ns), TP_FIELDS( ctf_integer(pid_t, tid, p->pid) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->lttng_ns_inum : 0) #endif ) @@ -140,7 +142,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_pid_ns, ret; })) ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_ns_inum : 0) #endif ) @@ -155,10 +157,10 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns, ctf_integer(pid_t, tid, p->pid) ctf_integer(uid_t, vuid, user_ns ? lttng_task_vuid(p, user_ns) : 0) ctf_integer(gid_t, vgid, user_ns ? lttng_task_vgid(p, user_ns) : 0) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) ctf_integer(int, ns_level, user_ns ? user_ns->level : 0) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->lttng_ns_inum : 0) #endif ) @@ -171,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns, TP_ARGS(session, p, uts_ns), TP_FIELDS( ctf_integer(pid_t, tid, p->pid) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->lttng_ns_inum : 0) #endif ) @@ -179,11 +181,12 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns, LTTNG_TRACEPOINT_EVENT(lttng_statedump_file_descriptor, TP_PROTO(struct lttng_session *session, - struct task_struct *p, int fd, const char *filename, + struct files_struct *files, + int fd, const char *filename, unsigned int flags, fmode_t fmode), - TP_ARGS(session, p, fd, filename, flags, fmode), + TP_ARGS(session, files, fd, filename, flags, fmode), TP_FIELDS( - ctf_integer(pid_t, pid, p->tgid) + ctf_integer_hex(struct files_struct *, file_table_address, files) ctf_integer(int, fd, fd) ctf_integer_oct(unsigned int, flags, flags) ctf_integer_hex(fmode_t, fmode, fmode) @@ -237,6 +240,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_interrupt, ctf_integer(unsigned int, irq, irq) ctf_string(name, chip_name) ctf_string(action, action->name ? : "") + ctf_integer(pid_t, tid, action->thread ? action->thread->pid : 0) ) )