Merge "sched: Print aggregation status in sched_get_busy trace event" (751207dd) · Commits · e / devices / android_kernel_sony_msm8998

include/trace/events/sched.h

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -631,9 +631,9 @@ TRACE_EVENT(sched_migration_update_sum,

	TRACE_EVENT(sched_get_busy,		TRACE_EVENT(sched_get_busy,

	TP_PROTO(int cpu, u64 load, u64 nload, u64 pload, int early),		TP_PROTO(int cpu, u64 load, u64 nload, u64 pload, int early, bool aggregated),

	TP_ARGS(cpu, load, nload, pload, early),		TP_ARGS(cpu, load, nload, pload, early, aggregated),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field( int, cpu )		__field( int, cpu )
	@@ -641,6 +641,7 @@ TRACE_EVENT(sched_get_busy,
	__field( u64, nload )		__field( u64, nload )
	__field( u64, pload )		__field( u64, pload )
	__field( int, early )		__field( int, early )
			__field( bool, aggregated )
	),		),

	TP_fast_assign(		TP_fast_assign(
	@@ -649,11 +650,12 @@ TRACE_EVENT(sched_get_busy,
	__entry->nload = nload;		__entry->nload = nload;
	__entry->pload = pload;		__entry->pload = pload;
	__entry->early = early;		__entry->early = early;
			__entry->aggregated = aggregated;
	),		),

	TP_printk("cpu %d load %lld new_task_load %lld predicted_load %lld early %d",		TP_printk("cpu %d load %lld new_task_load %lld predicted_load %lld early %d aggregated %d",
	__entry->cpu, __entry->load, __entry->nload,		__entry->cpu, __entry->load, __entry->nload,
	__entry->pload, __entry->early)		__entry->pload, __entry->early, __entry->aggregated)
	);		);

	TRACE_EVENT(sched_freq_alert,		TRACE_EVENT(sched_freq_alert,

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3274,7 +3274,9 @@ exit_early:
	trace_sched_get_busy(cpu, busy[i].prev_load,		trace_sched_get_busy(cpu, busy[i].prev_load,
	busy[i].new_task_load,		busy[i].new_task_load,
	busy[i].predicted_load,		busy[i].predicted_load,
	early_detection[i]);		early_detection[i],
			aggregate_load &&
			cpu == max_busy_cpu);
	i++;		i++;
	}		}
	}		}