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

Commit a634f933 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

cputime: Move thread_group_cputime() to sched code 



thread_group_cputime() is a general cputime API that is not only
used by posix cpu timer. Let's move this helper to sched code.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
parent ec05a231

kernel/posix-cpu-timers.c

+0 −24
Original line number Diff line number Diff line
@@ -217,30 +217,6 @@ static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p, 
	return 0;

}



void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)

{

	struct signal_struct *sig = tsk->signal;

	struct task_struct *t;



	times->utime = sig->utime;

	times->stime = sig->stime;

	times->sum_exec_runtime = sig->sum_sched_runtime;



	rcu_read_lock();

	/* make sure we can trust tsk->thread_group list */

	if (!likely(pid_alive(tsk)))

		goto out;



	t = tsk;

	do {

		times->utime += t->utime;

		times->stime += t->stime;

		times->sum_exec_runtime += task_sched_runtime(t);

	} while_each_thread(tsk, t);

out:

	rcu_read_unlock();

}



static void update_gt_cputime(struct task_cputime *a, struct task_cputime *b)

{

	if (b->utime > a->utime)

kernel/sched/cputime.c

+28 −0
Original line number Diff line number Diff line
@@ -288,6 +288,34 @@ static __always_inline bool steal_account_process_tick(void) 
	return false;

}



/*

 * Accumulate raw cputime values of dead tasks (sig->[us]time) and live

 * tasks (sum on group iteration) belonging to @tsk's group.

 */

void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)

{

	struct signal_struct *sig = tsk->signal;

	struct task_struct *t;



	times->utime = sig->utime;

	times->stime = sig->stime;

	times->sum_exec_runtime = sig->sum_sched_runtime;



	rcu_read_lock();

	/* make sure we can trust tsk->thread_group list */

	if (!likely(pid_alive(tsk)))

		goto out;



	t = tsk;

	do {

		times->utime += t->utime;

		times->stime += t->stime;

		times->sum_exec_runtime += task_sched_runtime(t);

	} while_each_thread(tsk, t);

out:

	rcu_read_unlock();

}



#ifndef CONFIG_VIRT_CPU_ACCOUNTING



#ifdef CONFIG_IRQ_TIME_ACCOUNTING