asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trace/sched: Fix compilation for 32 bit systems"

Browse source
This commit is contained in:
qctecmdr Service 2019-01-09 20:48:02 -08:00 committed by Gerrit - the friendly Code Review server
commit b773b20ab5
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/trace/events/sched.h
View file

@ -956,7 +956,7 @@ TRACE_EVENT(sched_load_avg_cpu,
__field(unsigned long, load_avg)
__field(unsigned long, util_avg)
__field(unsigned long, util_avg_pelt)
__field(unsigned long, util_avg_walt)
__field(u32, util_avg_walt)
),
TP_fast_assign(
@ -966,15 +966,15 @@ TRACE_EVENT(sched_load_avg_cpu,
__entry->util_avg_pelt = cfs_rq->avg.util_avg;
__entry->util_avg_walt = 0;
#ifdef CONFIG_SCHED_WALT
__entry->util_avg_walt =
cpu_rq(cpu)->prev_runnable_sum << SCHED_CAPACITY_SHIFT;
do_div(__entry->util_avg_walt, sched_ravg_window);
__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=%lu",
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)
);
@ -998,6 +998,8 @@ TRACE_EVENT(sched_load_se,
__field( unsigned long, load )
__field( unsigned long, rbl_load )
__field( unsigned long, util )
__field( unsigned long, util_pelt )
__field( u32, util_walt )
),
TP_fast_assign(
@ -1013,11 +1015,22 @@ TRACE_EVENT(sched_load_se,
__entry->load = se->avg.load_avg;
__entry->rbl_load = se->avg.runnable_load_avg;
__entry->util = se->avg.util_avg;
__entry->util_pelt = __entry->util;
__entry->util_walt = 0;
#ifdef CONFIG_SCHED_WALT
if (!se->my_q) {
struct task_struct *p = container_of(se, struct task_struct, se);
__entry->util_walt = p->ravg.demand / (sched_ravg_window >> SCHED_CAPACITY_SHIFT);
if (!walt_disabled && sysctl_sched_use_walt_task_util)
__entry->util = __entry->util_walt;
}
#endif
),
TP_printk("cpu=%d path=%s comm=%s pid=%d load=%lu rbl_load=%lu util=%lu",
TP_printk("cpu=%d path=%s comm=%s pid=%d load=%lu rbl_load=%lu util=%lu util_pelt=%lu util_walt=%u",
__entry->cpu, __get_str(path), __entry->comm, __entry->pid,
__entry->load, __entry->rbl_load, __entry->util)
__entry->load, __entry->rbl_load, __entry->util,
__entry->util_pelt, __entry->util_walt)
);
/*