diff options
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/sched.h | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 69aede209948..ae04e2095389 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -244,6 +244,9 @@ TRACE_EVENT(sched_update_task_ravg, __field( u64, ps ) __field( u32, curr_window ) __field( u32, prev_window ) + __field( u64, nt_cs ) + __field( u64, nt_ps ) + __field( u32, active_windows ) #endif ), @@ -267,12 +270,15 @@ TRACE_EVENT(sched_update_task_ravg, __entry->ps = rq->prev_runnable_sum; __entry->curr_window = p->ravg.curr_window; __entry->prev_window = p->ravg.prev_window; + __entry->nt_cs = rq->nt_curr_runnable_sum; + __entry->nt_ps = rq->nt_prev_runnable_sum; + __entry->active_windows = p->ravg.active_windows; #endif ), TP_printk("wc %llu ws %llu delta %llu event %s cpu %d cur_freq %u cur_pid %d task %d (%s) ms %llu delta %llu demand %u sum %u irqtime %llu" #ifdef CONFIG_SCHED_FREQ_INPUT - " cs %llu ps %llu cur_window %u prev_window %u" + " cs %llu ps %llu cur_window %u prev_window %u nt_cs %llu nt_ps %llu active_wins %u" #endif , __entry->wallclock, __entry->win_start, __entry->delta, task_event_names[__entry->evt], __entry->cpu, @@ -282,7 +288,9 @@ TRACE_EVENT(sched_update_task_ravg, __entry->sum, __entry->irqtime #ifdef CONFIG_SCHED_FREQ_INPUT , __entry->cs, __entry->ps, __entry->curr_window, - __entry->prev_window + __entry->prev_window, + __entry->nt_cs, __entry->nt_ps, + __entry->active_windows #endif ) ); @@ -374,37 +382,44 @@ TRACE_EVENT(sched_migration_update_sum, __field(int, pid ) __field( u64, cs ) __field( u64, ps ) + __field( s64, nt_cs ) + __field( s64, nt_ps ) ), TP_fast_assign( __entry->cpu = cpu_of(rq); __entry->cs = rq->curr_runnable_sum; __entry->ps = rq->prev_runnable_sum; + __entry->nt_cs = (s64)rq->nt_curr_runnable_sum; + __entry->nt_ps = (s64)rq->nt_prev_runnable_sum; __entry->pid = p->pid; ), - TP_printk("cpu %d: cs %llu ps %llu pid %d", __entry->cpu, - __entry->cs, __entry->ps, __entry->pid) + TP_printk("cpu %d: cs %llu ps %llu nt_cs %lld nt_ps %lld pid %d", + __entry->cpu, __entry->cs, __entry->ps, + __entry->nt_cs, __entry->nt_ps, __entry->pid) ); TRACE_EVENT(sched_get_busy, - TP_PROTO(int cpu, u64 load), + TP_PROTO(int cpu, u64 load, u64 nload), - TP_ARGS(cpu, load), + TP_ARGS(cpu, load, nload), TP_STRUCT__entry( __field( int, cpu ) __field( u64, load ) + __field( u64, nload ) ), TP_fast_assign( __entry->cpu = cpu; __entry->load = load; + __entry->nload = nload; ), - TP_printk("cpu %d load %lld", - __entry->cpu, __entry->load) + TP_printk("cpu %d load %lld new_task_load %lld", + __entry->cpu, __entry->load, __entry->nload) ); TRACE_EVENT(sched_freq_alert, |
