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

Commit e1ea811d authored by Srivatsa Vaddagiri's avatar Srivatsa Vaddagiri Committed by Syed Rameez Mustafa
Browse files

sched: window-stats: Remove unused prev_window variable 



Remove unused prev_window variable in 'struct ravg'

Change-Id: I22ec040bae6fa5810f9f8771aa1cb873a2183746
Signed-off-by: default avatarSrivatsa Vaddagiri <vatsa@codeaurora.org>
parent 288c9101

include/linux/sched.h

+1 −6
Original line number Diff line number Diff line
@@ -1065,16 +1065,11 @@ struct ravg { 
	 * sysctl_sched_ravg_hist_size windows. 'demand' could drive frequency

	 * demand for tasks.

	 *

	 * 'prev_window' is the history in the most recent window. This value

	 * may be zero if there was no task activity in that window - that is

	 * how this quantity differs from the most recent sample in

	 * sum_history (empty windows are ignored in sum_history).

	 *

	 * 'flags' can have either or both of PREV_WINDOW_CONTRIB and

	 * CURR_WINDOW_CONTRIB set.

	 */

	u64 mark_start;

	u32 sum, demand, prev_window, partial_demand, flags;

	u32 sum, demand, partial_demand, flags;

	u32 sum_history[RAVG_HIST_SIZE_MAX];

};

include/trace/events/sched.h

+2 −4
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ TRACE_EVENT(sched_update_task_ravg, 
		__field(unsigned int,	demand			)

		__field(unsigned int,	partial_demand		)

		__field(unsigned int,	sum			)

		__field(unsigned int,	prev_window		)

		__field(	 int,	cpu			)

	),
@@ -258,16 +257,15 @@ TRACE_EVENT(sched_update_task_ravg, 
		__entry->demand         = p->ravg.demand;

		__entry->partial_demand = p->ravg.partial_demand;

		__entry->sum            = p->ravg.sum;

		__entry->prev_window    = p->ravg.prev_window;

	),



	TP_printk("wc %llu ws %llu delta %llu event %s cpu %d cur_freq %u cs %u ps %u cur_pid %d task %d (%s) ms %llu delta %llu demand %u partial_demand %u sum %u prev_window %u",

	TP_printk("wc %llu ws %llu delta %llu event %s cpu %d cur_freq %u cs %u ps %u cur_pid %d task %d (%s) ms %llu delta %llu demand %u partial_demand %u sum %u",

		__entry->wallclock, __entry->win_start, __entry->delta,

		task_event_names[__entry->evt], __entry->cpu,

		__entry->cur_freq, __entry->cs, __entry->ps, __entry->cur_pid,

		__entry->pid, __entry->comm, __entry->mark_start,

		__entry->delta_m, __entry->demand, __entry->partial_demand,

		__entry->sum, __entry->prev_window)

		__entry->sum)

);



TRACE_EVENT(sched_update_history,

kernel/sched/core.c

+0 −4
Original line number Diff line number Diff line
@@ -1242,7 +1242,6 @@ update_history(struct rq *rq, struct task_struct *p, u32 runtime, int samples, 


	if (new_window) {

		p->ravg.flags = 0;

		p->ravg.prev_window = runtime;

		if (runtime)

			p->ravg.flags |= PREV_WINDOW_CONTRIB;

	}
@@ -1598,7 +1597,6 @@ static inline void mark_task_starting(struct task_struct *p) 
	if (!rq->window_start) {

		p->ravg.partial_demand = 0;

		p->ravg.demand = 0;

		p->ravg.prev_window = 0;

		p->ravg.sum = 0;

		return;

	}
@@ -1607,7 +1605,6 @@ static inline void mark_task_starting(struct task_struct *p) 
	p->ravg.mark_start = wallclock;

	rq->prev_runnable_sum += p->ravg.demand;

	rq->curr_runnable_sum += p->ravg.partial_demand;

	p->ravg.prev_window = p->ravg.demand;

	p->ravg.flags |= CURR_WINDOW_CONTRIB;

	p->ravg.flags |= PREV_WINDOW_CONTRIB;

}
@@ -1692,7 +1689,6 @@ void reset_all_window_stats(u64 window_start, unsigned int window_size, 
		p->ravg.sum = 0;

		p->ravg.demand = 0;

		p->ravg.partial_demand = 0;

		p->ravg.prev_window = 0;

		p->ravg.flags = 0;

		for (i = 0; i < RAVG_HIST_SIZE_MAX; ++i)

			p->ravg.sum_history[i] = 0;