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

Commit 6fac4829 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

cputime: Use accessors to read task cputime stats 



This is in preparation for the full dynticks feature. While
remotely reading the cputime of a task running in a full
dynticks CPU, we'll need to do some extra-computation. This
way we can account the time it spent tickless in userspace
since its last cputime snapshot.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent 3f4724ea

arch/alpha/kernel/osf_sys.c

+4 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ struct rusage32 { 
SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)

{

	struct rusage32 r;

	cputime_t utime, stime;



	if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN)

		return -EINVAL;
@@ -1146,8 +1147,9 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 
	memset(&r, 0, sizeof(r));

	switch (who) {

	case RUSAGE_SELF:

		jiffies_to_timeval32(current->utime, &r.ru_utime);

		jiffies_to_timeval32(current->stime, &r.ru_stime);

		task_cputime(current, &utime, &stime);

		jiffies_to_timeval32(utime, &r.ru_utime);

		jiffies_to_timeval32(stime, &r.ru_stime);

		r.ru_minflt = current->min_flt;

		r.ru_majflt = current->maj_flt;

		break;

arch/x86/kernel/apm_32.c

+6 −5
Original line number Diff line number Diff line
@@ -899,6 +899,7 @@ static void apm_cpu_idle(void) 
	static int use_apm_idle; /* = 0 */

	static unsigned int last_jiffies; /* = 0 */

	static unsigned int last_stime; /* = 0 */

	cputime_t stime;



	int apm_idle_done = 0;

	unsigned int jiffies_since_last_check = jiffies - last_jiffies;
@@ -906,23 +907,23 @@ static void apm_cpu_idle(void) 


	WARN_ONCE(1, "deprecated apm_cpu_idle will be deleted in 2012");

recalc:

	task_cputime(current, NULL, &stime);

	if (jiffies_since_last_check > IDLE_CALC_LIMIT) {

		use_apm_idle = 0;

		last_jiffies = jiffies;

		last_stime = current->stime;

	} else if (jiffies_since_last_check > idle_period) {

		unsigned int idle_percentage;



		idle_percentage = current->stime - last_stime;

		idle_percentage = stime - last_stime;

		idle_percentage *= 100;

		idle_percentage /= jiffies_since_last_check;

		use_apm_idle = (idle_percentage > idle_threshold);

		if (apm_info.forbid_idle)

			use_apm_idle = 0;

		last_jiffies = jiffies;

		last_stime = current->stime;

	}



	last_jiffies = jiffies;

	last_stime = stime;



	bucket = IDLE_LEAKY_MAX;



	while (!need_resched()) {

drivers/isdn/mISDN/stack.c

+6 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/slab.h>

#include <linux/mISDNif.h>

#include <linux/kthread.h>

#include <linux/sched.h>

#include "core.h"



static u_int	*debug;
@@ -202,6 +203,9 @@ static int 
mISDNStackd(void *data)

{

	struct mISDNstack *st = data;

#ifdef MISDN_MSG_STATS

	cputime_t utime, stime;

#endif

	int err = 0;



	sigfillset(&current->blocked);
@@ -303,9 +307,10 @@ mISDNStackd(void *data) 
	       "msg %d sleep %d stopped\n",

	       dev_name(&st->dev->dev), st->msg_cnt, st->sleep_cnt,

	       st->stopped_cnt);

	task_cputime(st->thread, &utime, &stime);

	printk(KERN_DEBUG

	       "mISDNStackd daemon for %s utime(%ld) stime(%ld)\n",

	       dev_name(&st->dev->dev), st->thread->utime, st->thread->stime);

	       dev_name(&st->dev->dev), utime, stime);

	printk(KERN_DEBUG

	       "mISDNStackd daemon for %s nvcsw(%ld) nivcsw(%ld)\n",

	       dev_name(&st->dev->dev), st->thread->nvcsw, st->thread->nivcsw);

fs/binfmt_elf.c

+6 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/elf.h>

#include <linux/utsname.h>

#include <linux/coredump.h>

#include <linux/sched.h>

#include <asm/uaccess.h>

#include <asm/param.h>

#include <asm/page.h>
@@ -1320,8 +1321,11 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

	} else {

		cputime_to_timeval(p->utime, &prstatus->pr_utime);

		cputime_to_timeval(p->stime, &prstatus->pr_stime);

		cputime_t utime, stime;



		task_cputime(p, &utime, &stime);

		cputime_to_timeval(utime, &prstatus->pr_utime);

		cputime_to_timeval(stime, &prstatus->pr_stime);

	}

	cputime_to_timeval(p->signal->cutime, &prstatus->pr_cutime);

	cputime_to_timeval(p->signal->cstime, &prstatus->pr_cstime);

fs/binfmt_elf_fdpic.c

+5 −2
Original line number Diff line number Diff line
@@ -1375,8 +1375,11 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

	} else {

		cputime_to_timeval(p->utime, &prstatus->pr_utime);

		cputime_to_timeval(p->stime, &prstatus->pr_stime);

		cputime_t utime, stime;



		task_cputime(p, &utime, &stime);

		cputime_to_timeval(utime, &prstatus->pr_utime);

		cputime_to_timeval(stime, &prstatus->pr_stime);

	}

	cputime_to_timeval(p->signal->cutime, &prstatus->pr_cutime);

	cputime_to_timeval(p->signal->cstime, &prstatus->pr_cstime);