mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm: memcg: print statistics directly to seq_file 

Being able to use seq_printf() allows being smarter about statistics
name strings, which are currently listed twice, with the only difference
being a "total_" prefix on the hierarchical version.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ying Han <yinghan@google.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Weiner 2012-05-29 15:07:06 -07:00 committed by Linus Torvalds
parent fada52ca0e
commit 78ccf5b5ab
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
mm/memcontrol.c
View File

@ -4060,26 +4060,22 @@ struct mcs_total_stat {
s64 stat[NR_MCS_STAT]; s64 stat[NR_MCS_STAT];
}; };
static struct { static const char *memcg_stat_strings[NR_MCS_STAT] = {
char *local_name; "cache",
char *total_name; "rss",
} memcg_stat_strings[NR_MCS_STAT] = { "mapped_file",
{"cache", "total_cache"}, "pgpgin",
{"rss", "total_rss"}, "pgpgout",
{"mapped_file", "total_mapped_file"}, "swap",
{"pgpgin", "total_pgpgin"}, "pgfault",
{"pgpgout", "total_pgpgout"}, "pgmajfault",
{"swap", "total_swap"}, "inactive_anon",
{"pgfault", "total_pgfault"}, "active_anon",
{"pgmajfault", "total_pgmajfault"}, "inactive_file",
{"inactive_anon", "total_inactive_anon"}, "active_file",
{"active_anon", "total_active_anon"}, "unevictable",
{"inactive_file", "total_inactive_file"},
{"active_file", "total_active_file"},
{"unevictable", "total_unevictable"}
}; };
static void static void
mem_cgroup_get_local_stat(struct mem_cgroup *memcg, struct mcs_total_stat *s) mem_cgroup_get_local_stat(struct mem_cgroup *memcg, struct mcs_total_stat *s)
{ {
@ -4175,7 +4171,7 @@ static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft,
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
struct cgroup_map_cb *cb) struct seq_file *m)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
struct mcs_total_stat mystat; struct mcs_total_stat mystat;
@ -4188,16 +4184,18 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
for (i = 0; i < NR_MCS_STAT; i++) { for (i = 0; i < NR_MCS_STAT; i++) {
if (i == MCS_SWAP && !do_swap_account) if (i == MCS_SWAP && !do_swap_account)
continue; continue;
cb->fill(cb, memcg_stat_strings[i].local_name, mystat.stat[i]); seq_printf(m, "%s %llu\n", memcg_stat_strings[i],
(unsigned long long)mystat.stat[i]);
} }
/* Hierarchical information */ /* Hierarchical information */
{ {
unsigned long long limit, memsw_limit; unsigned long long limit, memsw_limit;
memcg_get_hierarchical_limit(memcg, &limit, &memsw_limit); memcg_get_hierarchical_limit(memcg, &limit, &memsw_limit);
cb->fill(cb, "hierarchical_memory_limit", limit); seq_printf(m, "hierarchical_memory_limit %llu\n", limit);
if (do_swap_account) if (do_swap_account)
cb->fill(cb, "hierarchical_memsw_limit", memsw_limit); seq_printf(m, "hierarchical_memsw_limit %llu\n",
memsw_limit);
} }
memset(&mystat, 0, sizeof(mystat)); memset(&mystat, 0, sizeof(mystat));
@ -4205,7 +4203,8 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
for (i = 0; i < NR_MCS_STAT; i++) { for (i = 0; i < NR_MCS_STAT; i++) {
if (i == MCS_SWAP && !do_swap_account) if (i == MCS_SWAP && !do_swap_account)
continue; continue;
cb->fill(cb, memcg_stat_strings[i].total_name, mystat.stat[i]); seq_printf(m, "total_%s %llu\n", memcg_stat_strings[i],
(unsigned long long)mystat.stat[i]);
} }
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
@ -4226,10 +4225,10 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
recent_scanned[0] += rstat->recent_scanned[0]; recent_scanned[0] += rstat->recent_scanned[0];
recent_scanned[1] += rstat->recent_scanned[1]; recent_scanned[1] += rstat->recent_scanned[1];
} }
cb->fill(cb, "recent_rotated_anon", recent_rotated[0]); seq_printf(m, "recent_rotated_anon %lu\n", recent_rotated[0]);
cb->fill(cb, "recent_rotated_file", recent_rotated[1]); seq_printf(m, "recent_rotated_file %lu\n", recent_rotated[1]);
cb->fill(cb, "recent_scanned_anon", recent_scanned[0]); seq_printf(m, "recent_scanned_anon %lu\n", recent_scanned[0]);
cb->fill(cb, "recent_scanned_file", recent_scanned[1]); seq_printf(m, "recent_scanned_file %lu\n", recent_scanned[1]);
} }
#endif #endif
@ -4663,7 +4662,7 @@ static struct cftype mem_cgroup_files[] = {
}, },
{ {
.name = "stat", .name = "stat",
.read_map = mem_control_stat_show, .read_seq_string = mem_control_stat_show,
}, },
{ {
.name = "force_empty", .name = "force_empty",