Fix: sched for v4.11.5-rt1
[lttng-modules.git] / instrumentation / events / lttng-module / sched.h
index 1bea326135a428e0db10c42388a9683d58edd745..cb5b5b2bb245615830fad98a8058e406b75b9903 100644 (file)
@@ -4,18 +4,41 @@
 #if !defined(LTTNG_TRACE_SCHED_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_SCHED_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/sched.h>
+#include <linux/pid_namespace.h>
 #include <linux/binfmts.h>
 #include <linux/version.h>
 #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
+
+#define LTTNG_MAX_PID_NS_LEVEL 32
+
 #ifndef _TRACE_SCHED_DEF_
 #define _TRACE_SCHED_DEF_
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+
+static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
+{
+#ifdef CONFIG_SCHED_DEBUG
+       BUG_ON(p != current);
+#endif /* CONFIG_SCHED_DEBUG */
+       /*
+        * Preemption ignores task state, therefore preempted tasks are always RUNNING
+        * (we will not have dequeued if state != RUNNING).
+        */
+       return preempt ? TASK_RUNNING | TASK_STATE_MAX : p->state;
+}
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
 
 static inline long __trace_sched_switch_state(struct task_struct *p)
 {
@@ -99,17 +122,10 @@ LTTNG_TRACEPOINT_EVENT(sched_kthread_stop,
 
        TP_ARGS(t),
 
-       TP_STRUCT__entry(
-               __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  tid                     )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, t->comm, TASK_COMM_LEN)
-               tp_assign(tid, t->pid)
-       ),
-
-       TP_printk("comm=%s tid=%d", __entry->comm, __entry->tid)
+       TP_FIELDS(
+               ctf_array_text(char, comm, t->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, t->pid)
+       )
 )
 
 /*
@@ -121,20 +137,30 @@ LTTNG_TRACEPOINT_EVENT(sched_kthread_stop_ret,
 
        TP_ARGS(ret),
 
-       TP_STRUCT__entry(
-               __field(        int,    ret     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("ret=%d", __entry->ret)
+       TP_FIELDS(
+               ctf_integer(int, ret, ret)
+       )
 )
 
 /*
  * Tracepoint for waking up a task:
  */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) || \
+       LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
+
+       TP_PROTO(struct task_struct *p),
+
+       TP_ARGS(p),
+
+       TP_FIELDS(
+               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, p->pid)
+               ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
+               ctf_integer(int, target_cpu, task_cpu(p))
+       )
+)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */
 LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
@@ -147,43 +173,45 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
        TP_ARGS(rq, p, success),
 #endif
 
-       TP_STRUCT__entry(
-               __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  tid                     )
-               __field(        int,    prio                    )
-               __field(        int,    success                 )
+       TP_FIELDS(
+               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, p->pid)
+               ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
+               ctf_integer(int, success, success)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-               __field(        int,    target_cpu              )
+               ctf_integer(int, target_cpu, task_cpu(p))
 #endif
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(tid, p->pid)
-               tp_assign(prio, p->prio)
-               tp_assign(success, success)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-               tp_assign(target_cpu, task_cpu(p))
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
        )
-       TP_perf_assign(
-               __perf_task(p)
-#endif
-       ),
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-       TP_printk("comm=%s tid=%d prio=%d success=%d target_cpu=%03d",
-                 __entry->comm, __entry->tid, __entry->prio,
-                 __entry->success, __entry->target_cpu)
-#else
-       TP_printk("comm=%s tid=%d prio=%d success=%d",
-                 __entry->comm, __entry->tid, __entry->prio,
-                 __entry->success)
-#endif
 )
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) || \
+       LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0))
+
+/*
+ * Tracepoint called when waking a task; this tracepoint is guaranteed to be
+ * called from the waking context.
+ */
+LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_waking,
+            TP_PROTO(struct task_struct *p),
+            TP_ARGS(p))
+
+/*
+ * Tracepoint called when the task is actually woken; p->state == TASK_RUNNNG.
+ * It it not always called from the waking context.
+ */
+LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
+            TP_PROTO(struct task_struct *p),
+            TP_ARGS(p))
+
+/*
+ * Tracepoint for waking up a new task:
+ */
+LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
+            TP_PROTO(struct task_struct *p),
+            TP_ARGS(p))
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
             TP_PROTO(struct task_struct *p, int success),
@@ -216,7 +244,13 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
  */
 LTTNG_TRACEPOINT_EVENT(sched_switch,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+       TP_PROTO(bool preempt,
+                struct task_struct *prev,
+                struct task_struct *next),
+
+       TP_ARGS(preempt, prev, next),
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct task_struct *prev,
                 struct task_struct *next),
 
@@ -228,50 +262,21 @@ LTTNG_TRACEPOINT_EVENT(sched_switch,
        TP_ARGS(rq, prev, next),
 #endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
 
-       TP_STRUCT__entry(
-               __array_text(   char,   prev_comm,      TASK_COMM_LEN   )
-               __field(        pid_t,  prev_tid                        )
-               __field(        int,    prev_prio                       )
-               __field(        long,   prev_state                      )
-               __array_text(   char,   next_comm,      TASK_COMM_LEN   )
-               __field(        pid_t,  next_tid                        )
-               __field(        int,    next_prio                       )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(next_comm, next->comm, TASK_COMM_LEN)
-               tp_assign(prev_tid, prev->pid)
-               tp_assign(prev_prio, prev->prio - MAX_RT_PRIO)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-               tp_assign(prev_state, __trace_sched_switch_state(prev))
-#else
-               tp_assign(prev_state, prev->state)
-#endif
-               tp_memcpy(prev_comm, prev->comm, TASK_COMM_LEN)
-               tp_assign(next_tid, next->pid)
-               tp_assign(next_prio, next->prio - MAX_RT_PRIO)
-       ),
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-       TP_printk("prev_comm=%s prev_tid=%d prev_prio=%d prev_state=%s%s ==> next_comm=%s next_tid=%d next_prio=%d",
-               __entry->prev_comm, __entry->prev_tid, __entry->prev_prio,
-               __entry->prev_state & (TASK_STATE_MAX-1) ?
-                 __print_flags(__entry->prev_state & (TASK_STATE_MAX-1), "|",
-                               { 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },
-                               { 16, "Z" }, { 32, "X" }, { 64, "x" },
-                               { 128, "W" }) : "R",
-               __entry->prev_state & TASK_STATE_MAX ? "+" : "",
-               __entry->next_comm, __entry->next_tid, __entry->next_prio)
+       TP_FIELDS(
+               ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
+               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))
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+               ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
 #else
-       TP_printk("prev_comm=%s prev_tid=%d prev_prio=%d prev_state=%s ==> next_comm=%s next_tid=%d next_prio=%d",
-               __entry->prev_comm, __entry->prev_tid, __entry->prev_prio,
-               __entry->prev_state ?
-                 __print_flags(__entry->prev_state, "|",
-                               { 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },
-                               { 16, "Z" }, { 32, "X" }, { 64, "x" },
-                               { 128, "W" }) : "R",
-               __entry->next_comm, __entry->next_tid, __entry->next_prio)
+               ctf_integer(long, prev_state, prev->state)
 #endif
+               ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, next_tid, next->pid)
+               ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO)
+       )
 )
 
 /*
@@ -283,25 +288,13 @@ LTTNG_TRACEPOINT_EVENT(sched_migrate_task,
 
        TP_ARGS(p, dest_cpu),
 
-       TP_STRUCT__entry(
-               __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  tid                     )
-               __field(        int,    prio                    )
-               __field(        int,    orig_cpu                )
-               __field(        int,    dest_cpu                )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(tid, p->pid)
-               tp_assign(prio, p->prio - MAX_RT_PRIO)
-               tp_assign(orig_cpu, task_cpu(p))
-               tp_assign(dest_cpu, dest_cpu)
-       ),
-
-       TP_printk("comm=%s tid=%d prio=%d orig_cpu=%d dest_cpu=%d",
-                 __entry->comm, __entry->tid, __entry->prio,
-                 __entry->orig_cpu, __entry->dest_cpu)
+       TP_FIELDS(
+               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, p->pid)
+               ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
+               ctf_integer(int, orig_cpu, task_cpu(p))
+               ctf_integer(int, dest_cpu, dest_cpu)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(sched_process_template,
@@ -310,20 +303,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_process_template,
 
        TP_ARGS(p),
 
-       TP_STRUCT__entry(
-               __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  tid                     )
-               __field(        int,    prio                    )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(tid, p->pid)
-               tp_assign(prio, p->prio - MAX_RT_PRIO)
-       ),
-
-       TP_printk("comm=%s tid=%d prio=%d",
-                 __entry->comm, __entry->tid, __entry->prio)
+       TP_FIELDS(
+               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, p->pid)
+               ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
+       )
 )
 
 /*
@@ -332,7 +316,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_process_template,
 LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_process_free,
             TP_PROTO(struct task_struct *p),
             TP_ARGS(p))
-            
+
 
 /*
  * Tracepoint for a task exiting:
@@ -363,20 +347,11 @@ LTTNG_TRACEPOINT_EVENT(sched_process_wait,
 
        TP_ARGS(pid),
 
-       TP_STRUCT__entry(
-               __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  tid                     )
-               __field(        int,    prio                    )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, current->comm, TASK_COMM_LEN)
-               tp_assign(tid, pid_nr(pid))
-               tp_assign(prio, current->prio - MAX_RT_PRIO)
-       ),
-
-       TP_printk("comm=%s tid=%d prio=%d",
-                 __entry->comm, __entry->tid, __entry->prio)
+       TP_FIELDS(
+               ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, pid_nr(pid))
+               ctf_integer(int, prio, current->prio - MAX_RT_PRIO)
+       )
 )
 
 /*
@@ -387,33 +362,74 @@ LTTNG_TRACEPOINT_EVENT(sched_process_wait,
  * == child_pid, while creation of a thread yields to child_tid !=
  * child_pid.
  */
-LTTNG_TRACEPOINT_EVENT(sched_process_fork,
+LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
 
        TP_PROTO(struct task_struct *parent, struct task_struct *child),
 
        TP_ARGS(parent, child),
 
-       TP_STRUCT__entry(
-               __array_text(   char,   parent_comm,    TASK_COMM_LEN   )
-               __field(        pid_t,  parent_tid                      )
-               __field(        pid_t,  parent_pid                      )
-               __array_text(   char,   child_comm,     TASK_COMM_LEN   )
-               __field(        pid_t,  child_tid                       )
-               __field(        pid_t,  child_pid                       )
+       TP_locvar(
+               pid_t vtids[LTTNG_MAX_PID_NS_LEVEL];
+               unsigned int ns_level;
+       ),
+
+       TP_code_pre(
+               if (child) {
+                       struct pid *child_pid;
+                       unsigned int i;
+
+                       child_pid = task_pid(child);
+                       tp_locvar->ns_level =
+                               min_t(unsigned int, child_pid->level + 1,
+                                       LTTNG_MAX_PID_NS_LEVEL);
+                       for (i = 0; i < tp_locvar->ns_level; i++)
+                               tp_locvar->vtids[i] = child_pid->numbers[i].nr;
+               }
        ),
 
-       TP_fast_assign(
-               tp_memcpy(parent_comm, parent->comm, TASK_COMM_LEN)
-               tp_assign(parent_tid, parent->pid)
-               tp_assign(parent_pid, parent->tgid)
-               tp_memcpy(child_comm, child->comm, TASK_COMM_LEN)
-               tp_assign(child_tid, child->pid)
-               tp_assign(child_pid, child->tgid)
+       TP_FIELDS(
+               ctf_array_text(char, parent_comm, parent->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, parent_tid, parent->pid)
+               ctf_integer(pid_t, parent_pid, parent->tgid)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+               ctf_integer(unsigned int, parent_ns_inum,
+                       ({
+                               unsigned int parent_ns_inum = 0;
+
+                               if (parent) {
+                                       struct pid_namespace *pid_ns;
+
+                                       pid_ns = task_active_pid_ns(parent);
+                                       if (pid_ns)
+                                               parent_ns_inum =
+                                                       pid_ns->lttng_proc_inum;
+                               }
+                               parent_ns_inum;
+                       }))
+#endif
+               ctf_array_text(char, child_comm, child->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, child_tid, child->pid)
+               ctf_sequence(pid_t, vtids, tp_locvar->vtids, u8, tp_locvar->ns_level)
+               ctf_integer(pid_t, child_pid, child->tgid)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+               ctf_integer(unsigned int, child_ns_inum,
+                       ({
+                               unsigned int child_ns_inum = 0;
+
+                               if (child) {
+                                       struct pid_namespace *pid_ns;
+
+                                       pid_ns = task_active_pid_ns(child);
+                                       if (pid_ns)
+                                               child_ns_inum =
+                                                       pid_ns->lttng_proc_inum;
+                               }
+                               child_ns_inum;
+                       }))
+#endif
        ),
 
-       TP_printk("comm=%s tid=%d child_comm=%s child_tid=%d",
-               __entry->parent_comm, __entry->parent_tid,
-               __entry->child_comm, __entry->child_tid)
+       TP_code_post()
 )
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
@@ -426,20 +442,11 @@ LTTNG_TRACEPOINT_EVENT(sched_signal_send,
 
        TP_ARGS(sig, p),
 
-       TP_STRUCT__entry(
-               __field(        int,    sig                     )
-               __array(        char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(pid, p->pid)
-               tp_assign(sig, sig)
-       ),
-
-       TP_printk("sig=%d comm=%s pid=%d",
-               __entry->sig, __entry->comm, __entry->pid)
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, p->pid)
+       )
 )
 #endif
 
@@ -454,20 +461,11 @@ LTTNG_TRACEPOINT_EVENT(sched_process_exec,
 
        TP_ARGS(p, old_pid, bprm),
 
-       TP_STRUCT__entry(
-               __string(       filename,       bprm->filename  )
-               __field(        pid_t,          tid             )
-               __field(        pid_t,          old_tid         )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(filename, bprm->filename)
-               tp_assign(tid, p->pid)
-               tp_assign(old_tid, old_pid)
-       ),
-
-       TP_printk("filename=%s tid=%d old_tid=%d", __get_str(filename),
-                 __entry->tid, __entry->old_tid)
+       TP_FIELDS(
+               ctf_string(filename, bprm->filename)
+               ctf_integer(pid_t, tid, p->pid)
+               ctf_integer(pid_t, old_tid, old_pid)
+       )
 )
 #endif
 
@@ -482,24 +480,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_stat_template,
 
        TP_ARGS(tsk, delay),
 
-       TP_STRUCT__entry(
-               __array_text( char,     comm,   TASK_COMM_LEN   )
-               __field( pid_t, tid                     )
-               __field( u64,   delay                   )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, tsk->comm, TASK_COMM_LEN)
-               tp_assign(tid,  tsk->pid)
-               tp_assign(delay, delay)
+       TP_FIELDS(
+               ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, tsk->pid)
+               ctf_integer(u64, delay, delay)
        )
-       TP_perf_assign(
-               __perf_count(delay)
-       ),
-
-       TP_printk("comm=%s tid=%d delay=%Lu [ns]",
-                       __entry->comm, __entry->tid,
-                       (unsigned long long)__entry->delay)
 )
 
 
@@ -546,65 +531,56 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
 
        TP_ARGS(tsk, runtime, vruntime),
 
-       TP_STRUCT__entry(
-               __array_text( char,     comm,   TASK_COMM_LEN   )
-               __field( pid_t, tid                     )
-               __field( u64,   runtime                 )
-               __field( u64,   vruntime                        )
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(comm, tsk->comm, TASK_COMM_LEN)
-               tp_assign(tid, tsk->pid)
-               tp_assign(runtime, runtime)
-               tp_assign(vruntime, vruntime)
+       TP_FIELDS(
+               ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, tsk->pid)
+               ctf_integer(u64, runtime, runtime)
+               ctf_integer(u64, vruntime, vruntime)
        )
-       TP_perf_assign(
-               __perf_count(runtime)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
-               __perf_task(tsk)
-#endif
-       ),
-
-       TP_printk("comm=%s tid=%d runtime=%Lu [ns] vruntime=%Lu [ns]",
-                       __entry->comm, __entry->tid,
-                       (unsigned long long)__entry->runtime,
-                       (unsigned long long)__entry->vruntime)
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) || \
+       LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \
+       LTTNG_RT_KERNEL_RANGE(4,11,5,1, 4,12,0,0))
 /*
  * Tracepoint for showing priority inheritance modifying a tasks
  * priority.
  */
 LTTNG_TRACEPOINT_EVENT(sched_pi_setprio,
 
-       TP_PROTO(struct task_struct *tsk, int newprio),
+       TP_PROTO(struct task_struct *tsk, struct task_struct *pi_task),
 
-       TP_ARGS(tsk, newprio),
+       TP_ARGS(tsk, pi_task),
 
-       TP_STRUCT__entry(
-               __array_text( char,     comm,   TASK_COMM_LEN   )
-               __field( pid_t, tid                     )
-               __field( int,   oldprio                 )
-               __field( int,   newprio                 )
-       ),
+       TP_FIELDS(
+               ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, tsk->pid)
+               ctf_integer(int, oldprio, tsk->prio - MAX_RT_PRIO)
+               ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO)
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+/*
+ * Tracepoint for showing priority inheritance modifying a tasks
+ * priority.
+ */
+LTTNG_TRACEPOINT_EVENT(sched_pi_setprio,
 
-       TP_fast_assign(
-               tp_memcpy(comm, tsk->comm, TASK_COMM_LEN)
-               tp_assign(tid, tsk->pid)
-               tp_assign(oldprio, tsk->prio - MAX_RT_PRIO)
-               tp_assign(newprio, newprio - MAX_RT_PRIO)
-       ),
+       TP_PROTO(struct task_struct *tsk, int newprio),
+
+       TP_ARGS(tsk, newprio),
 
-       TP_printk("comm=%s tid=%d oldprio=%d newprio=%d",
-                       __entry->comm, __entry->tid,
-                       __entry->oldprio, __entry->newprio)
+       TP_FIELDS(
+               ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, tid, tsk->pid)
+               ctf_integer(int, oldprio, tsk->prio - MAX_RT_PRIO)
+               ctf_integer(int, newprio, newprio - MAX_RT_PRIO)
+       )
 )
 #endif
 
 #endif /* LTTNG_TRACE_SCHED_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
This page took 0.02936 seconds and 4 git commands to generate.