X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsched.h;h=c505961745af047a3b6254343fa78aa23570d946;hb=721caea47b6506f7ad9086c3e9801dc9dfe06b6a;hp=5b4313a98983bc71cbc649c3e84812aca9921acd;hpb=27e6eda75df97483d07d61ba731bbc428e2161f9;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h
index 5b4313a9..c5059617 100644
--- a/instrumentation/events/lttng-module/sched.h
+++ b/instrumentation/events/lttng-module/sched.h
@@ -13,12 +13,7 @@
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
 #include <linux/sched/rt.h>
 #endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
-#define lttng_proc_inum ns.inum
-#else
-#define lttng_proc_inum proc_inum
-#endif
+#include <wrapper/namespace.h>
 
 #define LTTNG_MAX_PID_NS_LEVEL 32
 
@@ -170,6 +165,40 @@ static inline long __trace_sched_switch_state(struct task_struct *p)
 
 #endif /* _TRACE_SCHED_DEF_ */
 
+/*
+ * Enumeration of the task state bitmask.
+ * Only bit flags are enumerated here, not composition of states.
+ */
+LTTNG_TRACEPOINT_ENUM(task_state,
+	TP_ENUM_VALUES(
+		ctf_enum_value("TASK_RUNNING", TASK_RUNNING)
+		ctf_enum_value("TASK_INTERRUPTIBLE", TASK_INTERRUPTIBLE)
+		ctf_enum_value("TASK_UNINTERRUPTIBLE", TASK_UNINTERRUPTIBLE)
+		ctf_enum_value("TASK_STOPPED", __TASK_STOPPED)
+		ctf_enum_value("TASK_TRACED", __TASK_TRACED)
+		ctf_enum_value("EXIT_DEAD", EXIT_DEAD)
+		ctf_enum_value("EXIT_ZOMBIE", EXIT_ZOMBIE)
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+		ctf_enum_value("TASK_PARKED", TASK_PARKED)
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) */
+
+		ctf_enum_value("TASK_DEAD", TASK_DEAD)
+		ctf_enum_value("TASK_WAKEKILL", TASK_WAKEKILL)
+		ctf_enum_value("TASK_WAKING", TASK_WAKING)
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_enum_value("TASK_NOLOAD", TASK_NOLOAD)
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+		ctf_enum_value("TASK_NEW", TASK_NEW)
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) */
+
+		ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX)
+	)
+)
+
 /*
  * Tracepoint for calling kthread_stop, performed to end a kthread:
  */
@@ -310,9 +339,9 @@ LTTNG_TRACEPOINT_EVENT(sched_switch,
 		ctf_integer(pid_t, prev_tid, prev->pid)
 		ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
-		ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev))
+		ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev))
 #else
-		ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
+		ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev))
 #endif
 		ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
 		ctf_integer(pid_t, next_tid, next->pid)
@@ -437,7 +466,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
 					pid_ns = task_active_pid_ns(parent);
 					if (pid_ns)
 						parent_ns_inum =
-							pid_ns->lttng_proc_inum;
+							pid_ns->lttng_ns_inum;
 				}
 				parent_ns_inum;
 			}))
@@ -457,7 +486,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
 					pid_ns = task_active_pid_ns(child);
 					if (pid_ns)
 						child_ns_inum =
-							pid_ns->lttng_proc_inum;
+							pid_ns->lttng_ns_inum;
 				}
 				child_ns_inum;
 			}))