From c77bcc57af5391e264d0e7dcd4dfef097e564e08 Mon Sep 17 00:00:00 2001 From: Ying Han Date: Thu, 12 Jan 2012 17:18:27 -0800 Subject: [PATCH] --- yaml --- r: 284374 b: refs/heads/master c: 0527b6903b2838e214c895d527806aefd61b3c8f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/cgroups/memory.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0345a08fa64a..6e811dfc8327 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d66c1ce7df6ceb94d1902ac865ad50df4ffdb95f +refs/heads/master: 0527b6903b2838e214c895d527806aefd61b3c8f diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt index c7de7dac43b5..4c95c0034a4b 100644 --- a/trunk/Documentation/cgroups/memory.txt +++ b/trunk/Documentation/cgroups/memory.txt @@ -410,8 +410,11 @@ memory.stat file includes following statistics cache - # of bytes of page cache memory. rss - # of bytes of anonymous and swap cache memory. mapped_file - # of bytes of mapped file (includes tmpfs/shmem) -pgpgin - # of pages paged in (equivalent to # of charging events). -pgpgout - # of pages paged out (equivalent to # of uncharging events). +pgpgin - # of charging events to the memory cgroup. The charging + event happens each time a page is accounted as either mapped + anon page(RSS) or cache page(Page Cache) to the cgroup. +pgpgout - # of uncharging events to the memory cgroup. The uncharging + event happens each time a page is unaccounted from the cgroup. swap - # of bytes of swap usage inactive_anon - # of bytes of anonymous memory and swap cache memory on LRU list.