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

Commit d99ca3b9 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Ingo Molnar
Browse files

sched, cputime: Cleanups related to task_times() 



- Remove if({u,s}t)s because no one call it with NULL now.
- Use cputime_{add,sub}().
- Add ifndef-endif for prev_{u,s}time since they are used
  only when !VIRT_CPU_ACCOUNTING.

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Spencer Candland <spencer@bluehost.com>
Cc: Americo Wang <xiyou.wangcong@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
LKML-Reference: <4B1624C7.7040302@jp.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent be8147e6

include/linux/sched.h

+2 −0
Original line number Diff line number Diff line
@@ -1331,7 +1331,9 @@ struct task_struct { 


	cputime_t utime, stime, utimescaled, stimescaled;

	cputime_t gtime;

#ifndef CONFIG_VIRT_CPU_ACCOUNTING

	cputime_t prev_utime, prev_stime;

#endif

	unsigned long nvcsw, nivcsw; /* context switch counts */

	struct timespec start_time; 		/* monotonic time */

	struct timespec real_start_time;	/* boot based time */

kernel/fork.c

+2 −0
Original line number Diff line number Diff line
@@ -1066,8 +1066,10 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
	p->gtime = cputime_zero;

	p->utimescaled = cputime_zero;

	p->stimescaled = cputime_zero;

#ifndef CONFIG_VIRT_CPU_ACCOUNTING

	p->prev_utime = cputime_zero;

	p->prev_stime = cputime_zero;

#endif



	p->default_timer_slack_ns = current->timer_slack_ns;

kernel/sched.c

+6 −10
Original line number Diff line number Diff line
@@ -5184,9 +5184,7 @@ void account_idle_ticks(unsigned long ticks) 
#ifdef CONFIG_VIRT_CPU_ACCOUNTING

void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)

{

	if (ut)

	*ut = p->utime;

	if (st)

	*st = p->stime;

}

#else
@@ -5197,7 +5195,7 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st) 


void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)

{

	cputime_t rtime, utime = p->utime, total = utime + p->stime;

	cputime_t rtime, utime = p->utime, total = cputime_add(utime, p->stime);



	/*

	 * Use CFS's precise accounting:
@@ -5217,11 +5215,9 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st) 
	 * Compare with previous values, to keep monotonicity:

	 */

	p->prev_utime = max(p->prev_utime, utime);

	p->prev_stime = max(p->prev_stime, rtime - p->prev_utime);

	p->prev_stime = max(p->prev_stime, cputime_sub(rtime, p->prev_utime));



	if (ut)

	*ut = p->prev_utime;

	if (st)

	*st = p->prev_stime;

}

#endif