X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsched.h;h=9e490cfe411a2ac03f6268e278939c9d0109e665;hb=33673ee7b705adb6b24350c30966d4937d41ed95;hp=b68616e068111af4b67aa46ac91ef2fae4615ec9;hpb=3a523f5b6b4f8ca82412cb45f2d2ad9c44e7d249;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h index b68616e0..9e490cfe 100644 --- a/instrumentation/events/lttng-module/sched.h +++ b/instrumentation/events/lttng-module/sched.h @@ -6,10 +6,51 @@ #include #include +#include +#include +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +#include +#endif #ifndef _TRACE_SCHED_DEF_ #define _TRACE_SCHED_DEF_ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)) + +static inline long __trace_sched_switch_state(struct task_struct *p) +{ + long state = p->state; + +#ifdef CONFIG_PREEMPT + /* + * For all intents and purposes a preempted task is a running task. + */ + if (task_preempt_count(p) & PREEMPT_ACTIVE) + state = TASK_RUNNING | TASK_STATE_MAX; +#endif + + return state; +} + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) + +static inline long __trace_sched_switch_state(struct task_struct *p) +{ + long state = p->state; + +#ifdef CONFIG_PREEMPT + /* + * For all intents and purposes a preempted task is a running task. + */ + if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE) + state = TASK_RUNNING | TASK_STATE_MAX; +#endif + + return state; +} + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static inline long __trace_sched_switch_state(struct task_struct *p) { long state = p->state; @@ -25,6 +66,8 @@ static inline long __trace_sched_switch_state(struct task_struct *p) return state; } +#endif + #endif /* _TRACE_SCHED_DEF_ */ /* @@ -89,7 +132,9 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, __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( @@ -97,12 +142,25 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, 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 ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) @@ -164,12 +222,27 @@ TRACE_EVENT(sched_switch, 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) +#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 ? @@ -178,6 +251,7 @@ TRACE_EVENT(sched_switch, { 16, "Z" }, { 32, "X" }, { 64, "x" }, { 128, "W" }) : "R", __entry->next_comm, __entry->next_tid, __entry->next_prio) +#endif ) /* @@ -286,7 +360,12 @@ TRACE_EVENT(sched_process_wait, ) /* - * Tracepoint for do_fork: + * Tracepoint for do_fork. + * Saving both TID and PID information, especially for the child, allows + * trace analyzers to distinguish between creation of a new process and + * creation of a new thread. Newly created processes will have child_tid + * == child_pid, while creation of a thread yields to child_tid != + * child_pid. */ TRACE_EVENT(sched_process_fork, @@ -297,15 +376,19 @@ TRACE_EVENT(sched_process_fork, 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_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_printk("comm=%s tid=%d child_comm=%s child_tid=%d", @@ -313,6 +396,62 @@ TRACE_EVENT(sched_process_fork, __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. @@ -368,6 +507,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). @@ -393,6 +541,9 @@ TRACE_EVENT(sched_stat_runtime, ) 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]", @@ -400,7 +551,9 @@ TRACE_EVENT(sched_stat_runtime, (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. @@ -429,6 +582,7 @@ TRACE_EVENT(sched_pi_setprio, __entry->comm, __entry->tid, __entry->oldprio, __entry->newprio) ) +#endif #endif /* _TRACE_SCHED_H */