emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: reverting tmpfs subtraction from cached (18-FEB-2014)

Browse Source 
The subtraction was marked as reinforcing the misconception,
that memory in the page cache can be considered free.
The Cached value is not a sum of page cache and tmpfs,
as the tmpfs memory lives in the page cache and therefore
it's an inseparable part of it.
This commit is contained in:
Jaromir Capik 2014-04-30 13:59:34 +02:00
parent bef6b0f025
commit 2f96eef7f8
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
free.1
View File

@ -32,9 +32,7 @@ kernels 2.6.32, displayed as zero if not available)
Memory used by kernel buffers (Buffers in /proc/meminfo) Memory used by kernel buffers (Buffers in /proc/meminfo)
.TP .TP
\fBcached\fR \fBcached\fR
Memory used by the page cache (calculated as Cached - Shmem in Memory used by the page cache (Cached in /proc/meminfo)
/proc/meminfo - the Cached value is actually the sum of page cache and
tmpfs memory)
.SH OPTIONS .SH OPTIONS
.TP .TP
\fB\-b\fR, \fB\-\-bytes\fR \fB\-b\fR, \fB\-\-bytes\fR

2
proc/sysinfo.c
View File

@ -682,8 +682,6 @@ nextline:
} }
kb_swap_used = kb_swap_total - kb_swap_free; kb_swap_used = kb_swap_total - kb_swap_free;
kb_main_used = kb_main_total - kb_main_free; kb_main_used = kb_main_total - kb_main_free;
/* "Cached" includes "Shmem" - we want only the page cache here */
kb_main_cached -= kb_main_shared;
} }
/*****************************************************************/ /*****************************************************************/

3
vmstat.8
View File

@ -102,8 +102,7 @@ b: The number of processes in uninterruptible sleep.
swpd: the amount of virtual memory used. swpd: the amount of virtual memory used.
free: the amount of idle memory. free: the amount of idle memory.
buff: the amount of memory used as buffers. buff: the amount of memory used as buffers.
cache: the amount of memory used as cache (excluding tmpfs memory for cache: the amount of memory used as cache.
kernels 2.6.32+)
inact: the amount of inactive memory. (\-a option) inact: the amount of inactive memory. (\-a option)
active: the amount of active memory. (\-a option) active: the amount of active memory. (\-a option)
.fi .fi