X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Flttng-statedump.h;h=5ba7df20d49bd6b786bda24021ec97d9d3998018;hb=e7a0ca7205fd4be7c829d171baa8823fe4784c90;hp=5ce94fa68dfc45a3f0b910428b3c5e0739ec88ed;hpb=1965e6b461720f6e43ff77d71f1ea086d3da88d9;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index 5ce94fa6..5ba7df20 100644
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -41,13 +41,11 @@ 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,
-		struct pid_namespace *pid_ns),
-	TP_ARGS(session, p, type, mode, submode, status, pid_ns),
+		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, vtid, pid_ns ? task_pid_nr_ns(p, pid_ns) : 0)
 		ctf_integer(pid_t, pid, p->tgid)
-		ctf_integer(pid_t, vpid, pid_ns ? task_tgid_nr_ns(p, pid_ns) : 0)
 		ctf_integer(pid_t, ppid,
 			({
 				pid_t ret;
@@ -57,29 +55,13 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state,
 				rcu_read_unlock();
 				ret;
 			}))
-		ctf_integer(pid_t, vppid,
-			({
-				struct task_struct *parent;
-				pid_t ret = 0;
-
-				if (pid_ns) {
-					rcu_read_lock();
-					parent = rcu_dereference(p->real_parent);
-					ret = task_tgid_nr_ns(parent, pid_ns);
-					rcu_read_unlock();
-				}
-				ret;
-			}))
 		ctf_array_text(char, name, p->comm, TASK_COMM_LEN)
 		ctf_integer(int, type, type)
 		ctf_integer(int, mode, mode)
 		ctf_integer(int, submode, submode)
 		ctf_integer(int, status, status)
-		ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-		ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_proc_inum : 0)
-#endif
 		ctf_integer(unsigned int, cpu, task_cpu(p))
+		ctf_integer_hex(struct files_struct *, file_table_address, files)
 	)
 )
 
@@ -199,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)
@@ -257,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)
 	)
 )