projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix exec instrumentation: only for kernels 3.4.0 and higher
[lttng-modules.git] / instrumentation / events / lttng-module / sched.h
diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h
index fd78f24a8eedf6b4512d8ac2922467dd17792f86..ca46ed05cf7e4d4a52bff67b50fb1156e3e591f4 100644 (file)
--- a/instrumentation/events/lttng-module/sched.h
+++ b/instrumentation/events/lttng-module/sched.h
@@ -38,15 +38,15 @@ TRACE_EVENT(sched_kthread_stop,
 
        TP_STRUCT__entry(
                __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
+               __field(        pid_t,  tid                     )
        ),
 
        TP_fast_assign(
                tp_memcpy(comm, t->comm, TASK_COMM_LEN)
-               tp_assign(pid, t->pid)
+               tp_assign(tid, t->pid)
        ),
 
-       TP_printk("comm=%s pid=%d", __entry->comm, __entry->pid)
+       TP_printk("comm=%s tid=%d", __entry->comm, __entry->tid)
 )
 
 /*
@@ -74,13 +74,19 @@ TRACE_EVENT(sched_kthread_stop_ret,
  */
 DECLARE_EVENT_CLASS(sched_wakeup_template,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct task_struct *p, int success),
 
        TP_ARGS(p, success),
+#else
+       TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+
+       TP_ARGS(rq, p, success),
+#endif
 
        TP_STRUCT__entry(
                __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
+               __field(        pid_t,  tid                     )
                __field(        int,    prio                    )
                __field(        int,    success                 )
                __field(        int,    target_cpu              )
@@ -88,17 +94,19 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,
 
        TP_fast_assign(
                tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(pid, p->pid)
+               tp_assign(tid, p->pid)
                tp_assign(prio, p->prio)
                tp_assign(success, success)
                tp_assign(target_cpu, task_cpu(p))
        ),
 
-       TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d",
-                 __entry->comm, __entry->pid, __entry->prio,
+       TP_printk("comm=%s tid=%d prio=%d success=%d target_cpu=%03d",
+                 __entry->comm, __entry->tid, __entry->prio,
                  __entry->success, __entry->target_cpu)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+
 DEFINE_EVENT(sched_wakeup_template, sched_wakeup,
             TP_PROTO(struct task_struct *p, int success),
             TP_ARGS(p, success))
@@ -110,44 +118,66 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
             TP_PROTO(struct task_struct *p, int success),
             TP_ARGS(p, success))
 
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+
+DEFINE_EVENT(sched_wakeup_template, sched_wakeup,
+            TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+            TP_ARGS(rq, p, success))
+
+/*
+ * Tracepoint for waking up a new task:
+ */
+DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
+            TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+            TP_ARGS(rq, p, success))
+
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+
 /*
  * Tracepoint for task switches, performed by the scheduler:
  */
 TRACE_EVENT(sched_switch,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct task_struct *prev,
                 struct task_struct *next),
 
        TP_ARGS(prev, next),
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+       TP_PROTO(struct rq *rq, struct task_struct *prev,
+                struct task_struct *next),
+
+       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_pid                        )
+               __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_pid                        )
+               __field(        pid_t,  next_tid                        )
                __field(        int,    next_prio                       )
        ),
 
        TP_fast_assign(
                tp_memcpy(next_comm, next->comm, TASK_COMM_LEN)
-               tp_assign(prev_pid, prev->pid)
-               tp_assign(prev_prio, prev->prio)
+               tp_assign(prev_tid, prev->pid)
+               tp_assign(prev_prio, prev->prio - MAX_RT_PRIO)
                tp_assign(prev_state, __trace_sched_switch_state(prev))
                tp_memcpy(prev_comm, prev->comm, TASK_COMM_LEN)
-               tp_assign(next_pid, next->pid)
-               tp_assign(next_prio, next->prio)
+               tp_assign(next_tid, next->pid)
+               tp_assign(next_prio, next->prio - MAX_RT_PRIO)
        ),
 
-       TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s ==> next_comm=%s next_pid=%d next_prio=%d",
-               __entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
+       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_pid, __entry->next_prio)
+               __entry->next_comm, __entry->next_tid, __entry->next_prio)
 )
 
 /*
@@ -161,7 +191,7 @@ TRACE_EVENT(sched_migrate_task,
 
        TP_STRUCT__entry(
                __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
+               __field(        pid_t,  tid                     )
                __field(        int,    prio                    )
                __field(        int,    orig_cpu                )
                __field(        int,    dest_cpu                )
@@ -169,14 +199,14 @@ TRACE_EVENT(sched_migrate_task,
 
        TP_fast_assign(
                tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(pid, p->pid)
-               tp_assign(prio, p->prio)
+               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 pid=%d prio=%d orig_cpu=%d dest_cpu=%d",
-                 __entry->comm, __entry->pid, __entry->prio,
+       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)
 )
 
@@ -188,18 +218,18 @@ DECLARE_EVENT_CLASS(sched_process_template,
 
        TP_STRUCT__entry(
                __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
+               __field(        pid_t,  tid                     )
                __field(        int,    prio                    )
        ),
 
        TP_fast_assign(
                tp_memcpy(comm, p->comm, TASK_COMM_LEN)
-               tp_assign(pid, p->pid)
-               tp_assign(prio, p->prio)
+               tp_assign(tid, p->pid)
+               tp_assign(prio, p->prio - MAX_RT_PRIO)
        ),
 
-       TP_printk("comm=%s pid=%d prio=%d",
-                 __entry->comm, __entry->pid, __entry->prio)
+       TP_printk("comm=%s tid=%d prio=%d",
+                 __entry->comm, __entry->tid, __entry->prio)
 )
 
 /*
@@ -220,9 +250,15 @@ DEFINE_EVENT(sched_process_template, sched_process_exit,
 /*
  * Tracepoint for waiting on task to unschedule:
  */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 DEFINE_EVENT(sched_process_template, sched_wait_task,
        TP_PROTO(struct task_struct *p),
        TP_ARGS(p))
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+DEFINE_EVENT(sched_process_template, sched_wait_task,
+       TP_PROTO(struct rq *rq, struct task_struct *p),
+       TP_ARGS(rq, p))
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
 
 /*
  * Tracepoint for a waiting task:
@@ -235,18 +271,18 @@ TRACE_EVENT(sched_process_wait,
 
        TP_STRUCT__entry(
                __array_text(   char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
+               __field(        pid_t,  tid                     )
                __field(        int,    prio                    )
        ),
 
        TP_fast_assign(
                tp_memcpy(comm, current->comm, TASK_COMM_LEN)
-               tp_assign(pid, pid_nr(pid))
-               tp_assign(prio, current->prio)
+               tp_assign(tid, pid_nr(pid))
+               tp_assign(prio, current->prio - MAX_RT_PRIO)
        ),
 
-       TP_printk("comm=%s pid=%d prio=%d",
-                 __entry->comm, __entry->pid, __entry->prio)
+       TP_printk("comm=%s tid=%d prio=%d",
+                 __entry->comm, __entry->tid, __entry->prio)
 )
 
 /*
@@ -260,23 +296,51 @@ TRACE_EVENT(sched_process_fork,
 
        TP_STRUCT__entry(
                __array_text(   char,   parent_comm,    TASK_COMM_LEN   )
-               __field(        pid_t,  parent_pid                      )
+               __field(        pid_t,  parent_tid                      )
                __array_text(   char,   child_comm,     TASK_COMM_LEN   )
-               __field(        pid_t,  child_pid                       )
+               __field(        pid_t,  child_tid                       )
        ),
 
        TP_fast_assign(
                tp_memcpy(parent_comm, parent->comm, TASK_COMM_LEN)
-               tp_assign(parent_pid, parent->pid)
+               tp_assign(parent_tid, parent->pid)
                tp_memcpy(child_comm, child->comm, TASK_COMM_LEN)
-               tp_assign(child_pid, child->pid)
+               tp_assign(child_tid, child->pid)
        ),
 
-       TP_printk("comm=%s pid=%d child_comm=%s child_pid=%d",
-               __entry->parent_comm, __entry->parent_pid,
-               __entry->child_comm, __entry->child_pid)
+       TP_printk("comm=%s tid=%d child_comm=%s child_tid=%d",
+               __entry->parent_comm, __entry->parent_tid,
+               __entry->child_comm, __entry->child_tid)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+/*
+ * Tracepoint for exec:
+ */
+TRACE_EVENT(sched_process_exec,
+
+       TP_PROTO(struct task_struct *p, pid_t old_pid,
+                struct linux_binprm *bprm),
+
+       TP_ARGS(p, old_pid, bprm),
+
+       TP_STRUCT__entry(
+               __string(       filename,       bprm->filename  )
+               __field(        pid_t,          pid             )
+               __field(        pid_t,          old_pid         )
+       ),
+
+       TP_fast_assign(
+               tp_strcpy(filename, bprm->filename)
+               tp_assign(pid, p->pid)
+               tp_assign(old_pid, old_pid)
+       ),
+
+       TP_printk("filename=%s pid=%d old_pid=%d", __get_str(filename),
+                 __entry->pid, __entry->old_pid)
+)
+#endif
+
 /*
  * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
  *     adding sched_stat support to SCHED_FIFO/RR would be welcome.
@@ -289,21 +353,21 @@ DECLARE_EVENT_CLASS(sched_stat_template,
 
        TP_STRUCT__entry(
                __array_text( char,     comm,   TASK_COMM_LEN   )
-               __field( pid_t, pid                     )
+               __field( pid_t, tid                     )
                __field( u64,   delay                   )
        ),
 
        TP_fast_assign(
                tp_memcpy(comm, tsk->comm, TASK_COMM_LEN)
-               tp_assign(pid,  tsk->pid)
+               tp_assign(tid,  tsk->pid)
                tp_assign(delay, delay)
        )
        TP_perf_assign(
                __perf_count(delay)
        ),
 
-       TP_printk("comm=%s pid=%d delay=%Lu [ns]",
-                       __entry->comm, __entry->pid,
+       TP_printk("comm=%s tid=%d delay=%Lu [ns]",
+                       __entry->comm, __entry->tid,
                        (unsigned long long)__entry->delay)
 )
 
@@ -344,14 +408,14 @@ TRACE_EVENT(sched_stat_runtime,
 
        TP_STRUCT__entry(
                __array_text( char,     comm,   TASK_COMM_LEN   )
-               __field( pid_t, pid                     )
+               __field( pid_t, tid                     )
                __field( u64,   runtime                 )
                __field( u64,   vruntime                        )
        ),
 
        TP_fast_assign(
                tp_memcpy(comm, tsk->comm, TASK_COMM_LEN)
-               tp_assign(pid, tsk->pid)
+               tp_assign(tid, tsk->pid)
                tp_assign(runtime, runtime)
                tp_assign(vruntime, vruntime)
        )
@@ -359,8 +423,8 @@ TRACE_EVENT(sched_stat_runtime,
                __perf_count(runtime)
        ),
 
-       TP_printk("comm=%s pid=%d runtime=%Lu [ns] vruntime=%Lu [ns]",
-                       __entry->comm, __entry->pid,
+       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)
 )
@@ -377,20 +441,20 @@ TRACE_EVENT(sched_pi_setprio,
 
        TP_STRUCT__entry(
                __array_text( char,     comm,   TASK_COMM_LEN   )
-               __field( pid_t, pid                     )
+               __field( pid_t, tid                     )
                __field( int,   oldprio                 )
                __field( int,   newprio                 )
        ),
 
        TP_fast_assign(
                tp_memcpy(comm, tsk->comm, TASK_COMM_LEN)
-               tp_assign(pid, tsk->pid)
-               tp_assign(oldprio, tsk->prio)
-               tp_assign(newprio, newprio)
+               tp_assign(tid, tsk->pid)
+               tp_assign(oldprio, tsk->prio - MAX_RT_PRIO)
+               tp_assign(newprio, newprio - MAX_RT_PRIO)
        ),
 
-       TP_printk("comm=%s pid=%d oldprio=%d newprio=%d",
-                       __entry->comm, __entry->pid,
+       TP_printk("comm=%s tid=%d oldprio=%d newprio=%d",
+                       __entry->comm, __entry->tid,
                        __entry->oldprio, __entry->newprio)
 )
 
LTTng 2.0/0.x modules
This page took 0.029296 seconds and 4 git commands to generate.