diff options
| author | Tejun Heo | 2018-04-26 23:29:04 +0200 |
|---|---|---|
| committer | Tejun Heo | 2018-04-26 23:29:04 +0200 |
| commit | d4ff749b5e0f1e2d4d69a3e4ea81cdeaeb4904d2 (patch) | |
| tree | 99a922407a9aa00dbd7441e26969e18120a027e5 /kernel/cgroup/cgroup.c | |
| parent | cgroup: Rename stat to rstat (diff) | |
| download | kernel-qcow2-linux-d4ff749b5e0f1e2d4d69a3e4ea81cdeaeb4904d2.tar.gz kernel-qcow2-linux-d4ff749b5e0f1e2d4d69a3e4ea81cdeaeb4904d2.tar.xz kernel-qcow2-linux-d4ff749b5e0f1e2d4d69a3e4ea81cdeaeb4904d2.zip | |
cgroup: Distinguish base resource stat implementation from rstat
Base resource stat accounts universial (not specific to any
controller) resource consumptions on top of rstat. Currently, its
implementation is intermixed with rstat implementation making the code
confusing to follow.
This patch clarifies the distintion by doing the followings.
* Encapsulate base resource stat counters, currently only cputime, in
struct cgroup_base_stat.
* Move prev_cputime into struct cgroup and initialize it with cgroup.
* Rename the related functions so that they start with cgroup_base_stat.
* Prefix the related variables and field names with b.
This patch doesn't make any functional changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup/cgroup.c')
| -rw-r--r-- | kernel/cgroup/cgroup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 32eb7ce0ad71..31af98996692 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -54,6 +54,7 @@ #include <linux/proc_ns.h> #include <linux/nsproxy.h> #include <linux/file.h> +#include <linux/sched/cputime.h> #include <net/sock.h> #define CREATE_TRACE_POINTS @@ -1859,6 +1860,7 @@ static void init_cgroup_housekeeping(struct cgroup *cgrp) cgrp->dom_cgrp = cgrp; cgrp->max_descendants = INT_MAX; cgrp->max_depth = INT_MAX; + prev_cputime_init(&cgrp->prev_cputime); for_each_subsys(ss, ssid) INIT_LIST_HEAD(&cgrp->e_csets[ssid]); @@ -3396,7 +3398,7 @@ static int cpu_stat_show(struct seq_file *seq, void *v) struct cgroup __maybe_unused *cgrp = seq_css(seq)->cgroup; int ret = 0; - cgroup_stat_show_cputime(seq); + cgroup_base_stat_cputime_show(seq); #ifdef CONFIG_CGROUP_SCHED ret = cgroup_extra_stat_show(seq, cgrp, cpu_cgrp_id); #endif |