X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsched.h;h=4d30fe3e1acbb2eb74bff3e2f9c64db1a31fa788;hb=7c68b363332170e4db100327ecc9e09b8a79cf29;hp=fd78f24a8eedf6b4512d8ac2922467dd17792f86;hpb=5b88d86e2d45fed6d405fd9fb72d6c1c22d35374;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h index fd78f24a..4d30fe3e 100644 --- a/instrumentation/events/lttng-module/sched.h +++ b/instrumentation/events/lttng-module/sched.h @@ -6,10 +6,14 @@ #include #include +#include +#include #ifndef _TRACE_SCHED_DEF_ #define _TRACE_SCHED_DEF_ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static inline long __trace_sched_switch_state(struct task_struct *p) { long state = p->state; @@ -19,12 +23,18 @@ static inline long __trace_sched_switch_state(struct task_struct *p) * For all intents and purposes a preempted task is a running task. */ if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) + state = TASK_RUNNING | TASK_STATE_MAX; +#else state = TASK_RUNNING; +#endif #endif return state; } +#endif + #endif /* _TRACE_SCHED_DEF_ */ /* @@ -38,15 +48,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,31 +84,54 @@ 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 ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) __field( int, target_cpu ) +#endif ), 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) +#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 ), - TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d", - __entry->comm, __entry->pid, __entry->prio, +#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 ) +#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 +143,82 @@ 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) +#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_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, +#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) +#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_pid, __entry->next_prio) + __entry->next_comm, __entry->next_tid, __entry->next_prio) +#endif ) /* @@ -161,7 +232,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 +240,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 +259,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 +291,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 +312,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 +337,79 @@ 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(2,6,33)) +/* + * Tracepoint for sending a signal: + */ +TRACE_EVENT(sched_signal_send, + + TP_PROTO(int sig, struct task_struct *p), + + 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) +) +#endif + +#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, 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) +) +#endif + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) /* * 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 +422,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) ) @@ -332,6 +465,15 @@ DEFINE_EVENT(sched_stat_template, sched_stat_iowait, TP_PROTO(struct task_struct *tsk, u64 delay), TP_ARGS(tsk, delay)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) +/* + * Tracepoint for accounting blocked time (time the task is in uninterruptible). + */ +DEFINE_EVENT(sched_stat_template, sched_stat_blocked, + TP_PROTO(struct task_struct *tsk, u64 delay), + TP_ARGS(tsk, delay)) +#endif + /* * Tracepoint for accounting runtime (time the task is executing * on a CPU). @@ -344,27 +486,32 @@ 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) ) TP_perf_assign( __perf_count(runtime) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) + __perf_task(tsk) +#endif ), - 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) ) +#endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) /* * Tracepoint for showing priority inheritance modifying a tasks * priority. @@ -377,22 +524,23 @@ 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) ) +#endif #endif /* _TRACE_SCHED_H */