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

free: clarification of credits for the Shmem support

Browse Source 
An unpleasant thing happened when I comitted the shmem support
for the 'free' tool. We already had a merge request from
Adrian Brzezinski in the queue, doing exactly the same.
As Adrian deserves credits, I'm reverting the change
and re-applying with the next commit in order to make
him a part of the project history.
This commit is contained in:
Jaromir Capik 2013-09-09 16:15:54 +02:00
parent 06c19f5ba4
commit 827fc0302e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
free.1
View File

@ -11,11 +11,8 @@ free \- Display amount of free and used memory in the system
.SH DESCRIPTION .SH DESCRIPTION
.B free .B free
displays the total amount of free and used physical and swap memory in the displays the total amount of free and used physical and swap memory in the
system, as well as the buffers used by the kernel. system, as well as the buffers used by the kernel. The shared memory column
The shared memory column represents either the MemShared value (2.4 series should be ignored; it is obsolete.
kernels) or the Shmem value (2.6 series kernels and later) taken from the
/proc/meminfo file. The value is zero if none of the entries is exported
by the kernel.
.SH OPTIONS .SH OPTIONS
.TP .TP
\fB\-b\fR, \fB\-\-bytes\fR \fB\-b\fR, \fB\-\-bytes\fR

3
proc/sysinfo.c
View File

@ -629,14 +629,13 @@ void meminfo(void){
{"LowTotal", &kb_low_total}, {"LowTotal", &kb_low_total},
{"Mapped", &kb_mapped}, // kB version of vmstat nr_mapped {"Mapped", &kb_mapped}, // kB version of vmstat nr_mapped
{"MemFree", &kb_main_free}, // important {"MemFree", &kb_main_free}, // important
{"MemShared", &kb_main_shared}, // obsolete since kernel 2.6! (sharing the variable with Shmem replacement) {"MemShared", &kb_main_shared}, // important, but now gone!
{"MemTotal", &kb_main_total}, // important {"MemTotal", &kb_main_total}, // important
{"NFS_Unstable", &kb_nfs_unstable}, {"NFS_Unstable", &kb_nfs_unstable},
{"PageTables", &kb_pagetables}, // kB version of vmstat nr_page_table_pages {"PageTables", &kb_pagetables}, // kB version of vmstat nr_page_table_pages
{"ReverseMaps", &nr_reversemaps}, // same as vmstat nr_page_table_pages {"ReverseMaps", &nr_reversemaps}, // same as vmstat nr_page_table_pages
{"SReclaimable", &kb_swap_reclaimable}, // "swap reclaimable" (dentry and inode structures) {"SReclaimable", &kb_swap_reclaimable}, // "swap reclaimable" (dentry and inode structures)
{"SUnreclaim", &kb_swap_unreclaimable}, {"SUnreclaim", &kb_swap_unreclaimable},
{"Shmem", &kb_main_shared}, // kernel 2.6 and later (sharing the output variable with obsolete MemShared)
{"Slab", &kb_slab}, // kB version of vmstat nr_slab {"Slab", &kb_slab}, // kB version of vmstat nr_slab
{"SwapCached", &kb_swap_cached}, {"SwapCached", &kb_swap_cached},
{"SwapFree", &kb_swap_free}, // important {"SwapFree", &kb_swap_free}, // important