X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Flttng-statedump.h;h=efd22d77dfb774a7711ed4a0daa6dd45149ceafa;hb=f0dbdefbdbc26a000ed546180b22144c5b48857d;hp=9757e205799c070572949d454d30decc330a6561;hpb=9edf633abc57e4bd2d38bc6955d1b5115b95e6ee;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index 9757e205..efd22d77 100644
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -5,6 +5,9 @@
 #define _TRACE_LTTNG_STATEDUMP_H
 
 #include <linux/tracepoint.h>
+#include <linux/nsproxy.h>
+#include <linux/pid_namespace.h>
+#include <linux/types.h>
 
 TRACE_EVENT(lttng_statedump_start,
 	TP_PROTO(struct lttng_session *session),
@@ -29,8 +32,9 @@ TRACE_EVENT(lttng_statedump_end,
 TRACE_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 pid_namespace *pid_ns),
+	TP_ARGS(session, p, type, mode, submode, status, pid_ns),
 	TP_STRUCT__entry(
 		__field(pid_t, tid)
 		__field(pid_t, vtid)
@@ -43,12 +47,13 @@ TRACE_EVENT(lttng_statedump_process_state,
 		__field(int, mode)
 		__field(int, submode)
 		__field(int, status)
+		__field(int, ns_level)
 	),
 	TP_fast_assign(
 		tp_assign(tid, p->pid)
-		tp_assign(vtid, !p->nsproxy ? 0 : task_pid_vnr(p))
+		tp_assign(vtid, pid_ns ? task_pid_nr_ns(p, pid_ns) : 0)
 		tp_assign(pid, p->tgid)
-		tp_assign(vpid, !p->nsproxy ? 0 : task_tgid_vnr(p))
+		tp_assign(vpid, pid_ns ? task_tgid_nr_ns(p, pid_ns) : 0)
 		tp_assign(ppid,
 			({
 				pid_t ret;
@@ -61,15 +66,14 @@ TRACE_EVENT(lttng_statedump_process_state,
 		tp_assign(vppid,
 			({
 				struct task_struct *parent;
-				pid_t ret;
+				pid_t ret = 0;
 
-				rcu_read_lock();
-				parent = rcu_dereference(current->real_parent);
-				if (!parent->nsproxy)
-					ret = 0;
-				else
-					ret = task_tgid_nr(parent);
-				rcu_read_unlock();
+				if (pid_ns) {
+					rcu_read_lock();
+					parent = rcu_dereference(p->real_parent);
+					ret = task_tgid_nr_ns(parent, pid_ns);
+					rcu_read_unlock();
+				}
 				ret;
 			}))
 		tp_memcpy(name, p->comm, TASK_COMM_LEN)
@@ -77,6 +81,7 @@ TRACE_EVENT(lttng_statedump_process_state,
 		tp_assign(mode, mode)
 		tp_assign(submode, submode)
 		tp_assign(status, status)
+		tp_assign(ns_level, pid_ns ? pid_ns->level : 0)
 	),
 	TP_printk("")
 )
@@ -137,6 +142,21 @@ TRACE_EVENT(lttng_statedump_network_interface,
 	TP_printk("")
 )
 
+TRACE_EVENT(lttng_statedump_block_device,
+	TP_PROTO(struct lttng_session *session,
+		dev_t dev, const char *diskname),
+	TP_ARGS(session, dev, diskname),
+	TP_STRUCT__entry(
+		__field(dev_t, dev)
+		__string(diskname, diskname)
+	),
+	TP_fast_assign(
+		tp_assign(dev, dev)
+		tp_strcpy(diskname, diskname)
+	),
+	TP_printk("")
+)
+
 /* Called with desc->lock held */
 TRACE_EVENT(lttng_statedump_interrupt,
 	TP_PROTO(struct lttng_session *session,
@@ -146,12 +166,12 @@ TRACE_EVENT(lttng_statedump_interrupt,
 	TP_STRUCT__entry(
 		__field(unsigned int, irq)
 		__string(name, chip_name)
-		__string(action, action->name)
+		__string(action, action->name ? : "")
 	),
 	TP_fast_assign(
 		tp_assign(irq, irq)
 		tp_strcpy(name, chip_name)
-		tp_strcpy(action, action->name)
+		tp_strcpy(action, action->name ? : "")
 	),
 	TP_printk("")
 )