From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: Glauber Costa <glommer@parallels.com>
Cc: linux-kernel@vger.kernel.org, paul@paulmenage.org,
lizf@cn.fujitsu.com, daniel.lezcano@free.fr,
jbottomley@parallels.com
Subject: Re: [PATCH 04/10] Display /proc/stat information per cgroup
Date: Wed, 05 Oct 2011 11:04:55 +0200 [thread overview]
Message-ID: <1317805495.6766.5.camel@twins> (raw)
In-Reply-To: <1317583287-18300-5-git-send-email-glommer@parallels.com>
On Sun, 2011-10-02 at 23:21 +0400, Glauber Costa wrote:
> @@ -3868,10 +3897,14 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
> */
> void account_steal_time(cputime_t cputime)
> {
> - u64 *cpustat = kstat_this_cpu->cpustat;
> + struct kernel_stat *kstat;
> u64 cputime64 = cputime_to_cputime64(cputime);
> -
> - cpustat[STEAL] += cputime64;
> +#ifdef CONFIG_CGROUP_SCHED
> + kstat = this_cpu_ptr(root_task_group.cpustat);
> +#else
> + kstat = __get_cpu_var(kstat);
> +#endif
> + kstat->cpustat[STEAL] += cputime64;
> }
> @@ -9111,17 +9179,28 @@ int cpu_cgroup_proc_stat(struct seq_file *p)
> jif = boottime.tv_sec;
>
> for_each_possible_cpu(i) {
> - user += kstat_this_cpu->cpustat[USER];
> - nice += kstat_this_cpu->cpustat[NICE];
> - system += kstat_this_cpu->cpustat[SYSTEM];
> - idle += kstat_this_cpu->cpustat[IDLE];
> + struct kernel_stat *kstat, *idle_kstat;
> +#ifdef CONFIG_CGROUP_SCHED
> + kstat = per_cpu_ptr(tg->cpustat, i);
> + idle_kstat = per_cpu_ptr(root_task_group.cpustat, i);
> +#else
> + kstat = per_cpu(kstat, i);
> + idle_kstat = kstat;
> +#endif
> +
> + user += kstat->cpustat[USER];
> + nice += kstat->cpustat[NICE];
> + system += kstat->cpustat[SYSTEM];
That if-deffery just begs to be killed by some helper function. Both
variants appear multiple times I think.
next prev parent reply other threads:[~2011-10-05 9:05 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-02 19:21 [PATCH 00/10] Per-cgroup /proc/stat information Glauber Costa
2011-10-02 19:21 ` [PATCH 01/10] trivial: initialize root cgroup's sibling list Glauber Costa
2011-10-02 19:21 ` [PATCH 02/10] Change cpustat fields to an array Glauber Costa
2011-10-02 19:21 ` [PATCH 03/10] Move /proc/stat logic inside sched.c Glauber Costa
2011-10-02 19:21 ` [PATCH 04/10] Display /proc/stat information per cgroup Glauber Costa
2011-10-05 8:56 ` Peter Zijlstra
2011-10-05 12:10 ` Glauber Costa
2011-10-05 12:38 ` Peter Zijlstra
2011-10-05 12:43 ` Glauber Costa
2011-10-05 9:04 ` Peter Zijlstra [this message]
2011-10-05 12:11 ` Glauber Costa
2011-10-02 19:21 ` [PATCH 05/10] Make total_forks per-cgroup Glauber Costa
2011-10-05 9:05 ` Peter Zijlstra
2011-10-05 12:12 ` Glauber Costa
2011-10-11 23:45 ` Frederic Weisbecker
2011-10-12 7:35 ` Glauber Costa
2011-10-12 12:59 ` Frederic Weisbecker
2011-10-12 12:59 ` Glauber Costa
2011-10-12 13:03 ` Frederic Weisbecker
2011-10-12 13:03 ` Glauber Costa
2011-10-12 14:03 ` Frederic Weisbecker
2011-10-02 19:21 ` [PATCH 06/10] per-cgroup boot time Glauber Costa
2011-10-02 19:21 ` [PATCH 07/10] Report steal time for cgroup Glauber Costa
2011-10-02 19:21 ` [PATCH 08/10] provide a version of cpuacct statistics inside cpu cgroup Glauber Costa
2011-10-05 9:10 ` Peter Zijlstra
2011-10-05 12:16 ` Glauber Costa
2011-10-02 19:21 ` [PATCH 09/10] provide a version of cpuusage " Glauber Costa
2011-10-05 9:14 ` Peter Zijlstra
2011-10-05 12:17 ` Glauber Costa
2011-10-05 9:46 ` Peter Zijlstra
2011-10-05 12:22 ` Glauber Costa
2011-10-05 12:31 ` Peter Zijlstra
2011-10-05 15:05 ` Glauber Costa
2011-10-02 19:21 ` [PATCH 10/10] Change CPUACCT to default n Glauber Costa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317805495.6766.5.camel@twins \
--to=a.p.zijlstra@chello.nl \
--cc=daniel.lezcano@free.fr \
--cc=glommer@parallels.com \
--cc=jbottomley@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=paul@paulmenage.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox