rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_NR_SWAP
Subsystems (3)
PATCH 1/1 rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_NR_SWAP
MEM_CGROUP_STAT_SWAPOUT represents the usage of swap rather than the number of swap-out events. Rename it to be MEM_CGROUP_STAT_NR_SWAP.
--- mm/memcontrol.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
mm/memcontrol.c +5 -5
@@ -97,7 +97,7 @@ enum mem_cgroup_stat_index {MEM_CGROUP_STAT_CACHE ,/* # of pages charged as cache */ MEM_CGROUP_STAT_RSS ,/* # of pages charged as anon rss */ MEM_CGROUP_STAT_FILE_MAPPED ,/* # of pages charged as file rss */ -MEM_CGROUP_STAT_SWAPOUT ,/* # of pages, swapped out */ +MEM_CGROUP_STAT_NR_SWAP ,/* # of pages, swapped out */ MEM_CGROUP_STAT_NSTATS, };
@@ -722,7 +722,7 @@ static void mem_cgroup_swap_statistics(struct mem_cgroup *memcg, bool charge) {int val = (charge) ?1 :-1 ; -this_cpu_add (memcg->stat->count[MEM_CGROUP_STAT_SWAPOUT ], val); +this_cpu_add (memcg->stat->count[MEM_CGROUP_STAT_NR_SWAP ], val); } static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
@@ -4042,7 +4042,7 @@ static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) val +=mem_cgroup_recursive_stat (memcg,MEM_CGROUP_STAT_RSS );if (swap) - val +=mem_cgroup_recursive_stat (memcg,MEM_CGROUP_STAT_SWAPOUT ); + val +=mem_cgroup_recursive_stat (memcg,MEM_CGROUP_STAT_NR_SWAP );return val <<PAGE_SHIFT ; }
@@ -4303,7 +4303,7 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,unsigned int i;for (i =0 ; i <MEM_CGROUP_STAT_NSTATS ; i++) { -if (i ==MEM_CGROUP_STAT_SWAPOUT && !do_swap_account) +if (i ==MEM_CGROUP_STAT_NR_SWAP && !do_swap_account)continue ;seq_printf (m,"%s %ld\n" , mem_cgroup_stat_names[i],mem_cgroup_read_stat (memcg, i) *PAGE_SIZE );
@@ -4330,7 +4330,7 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,for (i =0 ; i <MEM_CGROUP_STAT_NSTATS ; i++) {long long val =0 ; -if (i ==MEM_CGROUP_STAT_SWAPOUT && !do_swap_account) +if (i ==MEM_CGROUP_STAT_NR_SWAP && !do_swap_account)continue ;for_each_mem_cgroup_tree (mi, memcg) val +=mem_cgroup_read_stat (mi, i) *PAGE_SIZE ;
Signature · 9 lines
1.7.4.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 4 lines · KAMEZAWA Hiroyuki
MEM_CGROUP_STAT_SWAPOUTrepresents the usage of swap rather than the number of swap-out events. Rename it to beMEM_CGROUP_STAT_NR_SWAP.Signed-off-by KAMEZAWA Hiroyuki <[email protected]>
Quoted 63 lines
--- mm/memcontrol.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)mm/memcontrol.c +5
-5@@ -97,7 +97,7 @@ enum mem_cgroup_stat_index {MEM_CGROUP_STAT_CACHE ,/* # of pages charged as cache */ MEM_CGROUP_STAT_RSS ,/* # of pages charged as anon rss */ MEM_CGROUP_STAT_FILE_MAPPED ,/* # of pages charged as file rss */ -MEM_CGROUP_STAT_SWAPOUT ,/* # of pages, swapped out */ +MEM_CGROUP_STAT_NR_SWAP ,/* # of pages, swapped out */ MEM_CGROUP_STAT_NSTATS, };@@ -722,7 +722,7 @@ static void mem_cgroup_swap_statistics(struct mem_cgroup *memcg, bool charge) {int val = (charge) ?1 :-1 ; -this_cpu_add (memcg->stat->count[MEM_CGROUP_STAT_SWAPOUT ], val); +this_cpu_add (memcg->stat->count[MEM_CGROUP_STAT_NR_SWAP ], val); } static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,@@ -4042,7 +4042,7 @@ static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) val +=mem_cgroup_recursive_stat (memcg,MEM_CGROUP_STAT_RSS );if (swap) - val +=mem_cgroup_recursive_stat (memcg,MEM_CGROUP_STAT_SWAPOUT ); + val +=mem_cgroup_recursive_stat (memcg,MEM_CGROUP_STAT_NR_SWAP );return val <<PAGE_SHIFT ; }@@ -4303,7 +4303,7 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,unsigned int i;for (i =0 ; i <MEM_CGROUP_STAT_NSTATS ; i++) { -if (i ==MEM_CGROUP_STAT_SWAPOUT && !do_swap_account) +if (i ==MEM_CGROUP_STAT_NR_SWAP && !do_swap_account)continue ;seq_printf (m,"%s %ld\n" , mem_cgroup_stat_names[i],mem_cgroup_read_stat (memcg, i) *PAGE_SIZE );@@ -4330,7 +4330,7 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,for (i =0 ; i <MEM_CGROUP_STAT_NSTATS ; i++) {long long val =0 ; -if (i ==MEM_CGROUP_STAT_SWAPOUT && !do_swap_account) +if (i ==MEM_CGROUP_STAT_NR_SWAP && !do_swap_account)continue ;for_each_mem_cgroup_tree (mi, memcg) val +=mem_cgroup_read_stat (mi, i) *PAGE_SIZE ;Signature · 9 lines
1.7.4.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected] For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Signature · 6 lines
Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic
Johannes Weiner
maintainerQuoted 4 lines · Kamezawa Hiroyuki
MEM_CGROUP_STAT_SWAPOUTrepresents the usage of swap rather than the number of swap-out events. Rename it to beMEM_CGROUP_STAT_NR_SWAP.Signed-off-by KAMEZAWA Hiroyuki <[email protected]>
Wouldn't MEM_CGROUP_STAT_SWAP be better? It's equally descriptive but matches the string. And we also don't have NR_ for cache, rss, mapped file etc.
Quoted 9 lines · Johannes Weiner
Quoted 4 lines · Kamezawa Hiroyuki
MEM_CGROUP_STAT_SWAPOUTrepresents the usage of swap rather than the number of swap-out events. Rename it to beMEM_CGROUP_STAT_NR_SWAP.Signed-off-by KAMEZAWA Hiroyuki <[email protected]>Wouldn't
MEM_CGROUP_STAT_SWAPbe better? It's equally descriptive but matches the string. And we also don't haveNR_for cache, rss, mapped file etc.
That's just what I thought too.
You can attach Acked-by: Hugh Dickins <[email protected]> to MEM_CGROUP_STAT_SWAP and MEM_CGROUP_CHARGE_TYPE_ANON.
Oh, and to a patch deleting MEM_CGROUP_CHARGE_TYPE_FORCE!
Hugh
Quoted 11 lines · Hugh Dickins
Quoted 9 lines · Johannes Weiner
Quoted 4 lines · Kamezawa Hiroyuki
MEM_CGROUP_STAT_SWAPOUTrepresents the usage of swap rather than the number of swap-out events. Rename it to beMEM_CGROUP_STAT_NR_SWAP.Signed-off-by KAMEZAWA Hiroyuki<[email protected]>Wouldn't
MEM_CGROUP_STAT_SWAPbe better? It's equally descriptive but matches the string. And we also don't haveNR_for cache, rss, mapped file etc.
Quoted 7 lines
That's just what I thought too.
You can attach Acked-by: Hugh Dickins<[email protected]> to
MEM_CGROUP_STAT_SWAPandMEM_CGROUP_CHARGE_TYPE_ANON.Oh, and to a patch deleting
MEM_CGROUP_CHARGE_TYPE_FORCE!
Sure, I'll prepare v2.
Thanks,
-Kame