Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19fd21e9 authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Gerrit - the friendly Code Review server
Browse files

ANDROID: sched, trace: Remove trace event sched_load_avg_cpu 



The functionality of sched_load_avg_cpu can be provided by
sched_load_cfs_rq.
The WALT extension will be included into sched_load_cfs_rq by patch
(ANDROID: trace: Add WALT util signal to trace event sched_load_cfs_rq).

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Change-Id: I2e3944a6e60a77e3237b7c8cb29cbd840118a6ad
Git-commit: df6f68df
Git-repo: https://android.googlesource.com/kernel/common/


[satyap@codeaurora.org: trivial merge conflict resolution in
include/trace/events/sched.h due to WALT related changes to
sched_load_cfs_rq trace point]
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent 4daa6e69

include/trace/events/sched.h

+0 −39
Original line number Diff line number Diff line
@@ -798,45 +798,6 @@ extern unsigned int sched_ravg_window; 
extern unsigned int walt_disabled;

#endif



/*

 * Tracepoint for accounting cpu root cfs_rq

 */

TRACE_EVENT(sched_load_avg_cpu,



	TP_PROTO(int cpu, struct cfs_rq *cfs_rq),



	TP_ARGS(cpu, cfs_rq),



	TP_STRUCT__entry(

		__field( int,   cpu                             )

		__field( unsigned long, load_avg                )

		__field( unsigned long, util_avg                )

		__field( unsigned long, util_avg_pelt           )

		__field( u32,		util_avg_walt           )

	),



	TP_fast_assign(

		__entry->cpu                    = cpu;

		__entry->load_avg               = cfs_rq->avg.load_avg;

		__entry->util_avg               = cfs_rq->avg.util_avg;

		__entry->util_avg_pelt  = cfs_rq->avg.util_avg;

		__entry->util_avg_walt  = 0;

#ifdef CONFIG_SCHED_WALT

		__entry->util_avg_walt  = div64_ul(cpu_rq(cpu)->prev_runnable_sum,

					  sched_ravg_window >> SCHED_CAPACITY_SHIFT);



		if (!walt_disabled && sysctl_sched_use_walt_cpu_util)

			__entry->util_avg       = __entry->util_avg_walt;

#endif

	),



	TP_printk("cpu=%d load_avg=%lu util_avg=%lu "

			"util_avg_pelt=%lu util_avg_walt=%u",

		__entry->cpu, __entry->load_avg, __entry->util_avg,

		__entry->util_avg_pelt, __entry->util_avg_walt)

);





/*

 * Tracepoint for sched_entity load tracking:

 */

kernel/sched/fair.c

+0 −3
Original line number Diff line number Diff line
@@ -2881,9 +2881,6 @@ static inline void cfs_rq_util_change(struct cfs_rq *cfs_rq) 
		 * See cpu_util().

		 */

		cpufreq_update_util(rq, 0);

#ifdef CONFIG_SMP

		trace_sched_load_avg_cpu(cpu_of(rq), cfs_rq);

#endif

	}

}