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

top: exploit the newly added library smaps_rollup item

Browse Source 
We're just following the ps program's lead introducing
a new 'USS' field to represent the non-swapped portion
of physical memory ('RSS') not shared by another task.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2021-06-16 00:00:00 -05:00 committed by Craig Small
parent bbebf29dd1
commit a30d949acf
4 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
top/top.1
View File

@ -59,6 +59,8 @@
.ds XT See topic .ds XT See topic
.ds Xt see topic .ds Xt see topic
.ds XX See `OVERVIEW, Linux Memory Types' for additional details .ds XX See `OVERVIEW, Linux Memory Types' for additional details
.ds ZX Accessing smaps values is 10x more costly than other \
memory statistics and data for other users requires root privileges
. .
.\" Document ///////////////////////////////////////////////////////////// .\" Document /////////////////////////////////////////////////////////////
.\" ---------------------------------------------------------------------- .\" ----------------------------------------------------------------------
@ -826,9 +828,7 @@ It is also the sum of the `PSan', `PSfd' and `PSsh' fields.
For example, if a process has 1000 resident pages alone and 1000 resident For example, if a process has 1000 resident pages alone and 1000 resident
pages shared with another process, its `PSS' would be 1500 (times page size). pages shared with another process, its `PSS' would be 1500 (times page size).
Accessing smaps values is 10x more costly than \*(ZX.
other memory statistics and data for other users
requires root privileges.
.PP .PP
25.\fB PSan \*(Em Proportional Anonymous Memory, smaps (KiB) \fR 25.\fB PSan \*(Em Proportional Anonymous Memory, smaps (KiB) \fR
@ -841,9 +841,7 @@ As was true for `PSS' above (total proportional resident memory),
these fields represent the proportion of this task's share of each type these fields represent the proportion of this task's share of each type
of memory divided by the number of processes sharing it. of memory divided by the number of processes sharing it.
Accessing smaps values is 10x more costly than \*(ZX.
other memory statistics and data for other users
requires root privileges.
.RE .RE
.TP 4 .TP 4
@ -867,9 +865,7 @@ Another, more precise view of process non-swapped \*(MP.
It is obtained from the `smaps_rollup' file and is It is obtained from the `smaps_rollup' file and is
generally slightly larger than that shown for `RES'. generally slightly larger than that shown for `RES'.
Accessing smaps values is 10x more costly than \*(ZX.
other memory statistics and data for other users
requires root privileges.
.TP 4 .TP 4
30.\fB RSan \*(Em Resident Anonymous Memory Size (KiB) \fR 30.\fB RSan \*(Em Resident Anonymous Memory Size (KiB) \fR
@ -1018,7 +1014,15 @@ the swapped out portion of its address space (SWAP).
The\fI effective\fR user name of the task's owner. The\fI effective\fR user name of the task's owner.
.TP 4 .TP 4
52.\fB VIRT \*(Em Virtual Memory Size (KiB) \fR 52.\fB USS \*(Em Unique Set Size \fR
The non-swapped portion of \*(MP (`RSS') not shared with
any other process.
It is derived from the `smaps_rollup' file.
\*(ZX.
.TP 4
53.\fB VIRT \*(Em Virtual Memory Size (KiB) \fR
The total amount of \*(MV used by the task. The total amount of \*(MV used by the task.
It includes all code, data and shared libraries plus pages that have been It includes all code, data and shared libraries plus pages that have been
swapped out and pages that have been mapped but not used. swapped out and pages that have been mapped but not used.
@ -1026,13 +1030,13 @@ swapped out and pages that have been mapped but not used.
\*(XX. \*(XX.
.TP 4 .TP 4
53.\fB WCHAN \*(Em Sleeping in Function \fR 54.\fB WCHAN \*(Em Sleeping in Function \fR
This field will show the name of the kernel function in which the task This field will show the name of the kernel function in which the task
is currently sleeping. is currently sleeping.
Running tasks will display a dash (`\-') in this column. Running tasks will display a dash (`\-') in this column.
.TP 4 .TP 4
54.\fB nDRT \*(Em Dirty Pages Count \fR 55.\fB nDRT \*(Em Dirty Pages Count \fR
The number of pages that have been modified since they were last The number of pages that have been modified since they were last
written to \*(AS. written to \*(AS.
Dirty pages must be written to \*(AS before the corresponding physical Dirty pages must be written to \*(AS before the corresponding physical
@ -1041,7 +1045,7 @@ memory location can be used for some other virtual page.
This field was deprecated with linux 2.6 and is always zero. This field was deprecated with linux 2.6 and is always zero.
.TP 4 .TP 4
55.\fB nMaj \*(Em Major Page Fault Count \fR 56.\fB nMaj \*(Em Major Page Fault Count \fR
The number of\fB major\fR page faults that have occurred for a task. The number of\fB major\fR page faults that have occurred for a task.
A page fault occurs when a process attempts to read from or write to a A page fault occurs when a process attempts to read from or write to a
virtual page that is not currently present in its address space. virtual page that is not currently present in its address space.
@ -1049,7 +1053,7 @@ A major page fault is when \*(AS access is involved in making that
page available. page available.
.TP 4 .TP 4
56.\fB nMin \*(Em Minor Page Fault count \fR 57.\fB nMin \*(Em Minor Page Fault count \fR
The number of\fB minor\fR page faults that have occurred for a task. The number of\fB minor\fR page faults that have occurred for a task.
A page fault occurs when a process attempts to read from or write to a A page fault occurs when a process attempts to read from or write to a
virtual page that is not currently present in its address space. virtual page that is not currently present in its address space.
@ -1057,50 +1061,50 @@ A minor page fault does not involve \*(AS access in making that
page available. page available.
.TP 4 .TP 4
57.\fB nTH \*(Em Number of Threads \fR 58.\fB nTH \*(Em Number of Threads \fR
The number of threads associated with a process. The number of threads associated with a process.
.TP 4 .TP 4
58.\fB nsIPC \*(Em IPC namespace \fR 59.\fB nsIPC \*(Em IPC namespace \fR
The Inode of the namespace used to isolate interprocess communication (IPC) The Inode of the namespace used to isolate interprocess communication (IPC)
resources such as System V IPC objects and POSIX message queues. resources such as System V IPC objects and POSIX message queues.
.TP 4 .TP 4
59.\fB nsMNT \*(Em MNT namespace \fR 60.\fB nsMNT \*(Em MNT namespace \fR
The Inode of the namespace used to isolate filesystem mount points thus The Inode of the namespace used to isolate filesystem mount points thus
offering different views of the filesystem hierarchy. offering different views of the filesystem hierarchy.
.TP 4 .TP 4
60.\fB nsNET \*(Em NET namespace \fR 61.\fB nsNET \*(Em NET namespace \fR
The Inode of the namespace used to isolate resources such as network devices, The Inode of the namespace used to isolate resources such as network devices,
IP addresses, IP routing, port numbers, etc. IP addresses, IP routing, port numbers, etc.
.TP 4 .TP 4
61.\fB nsPID \*(Em PID namespace \fR 62.\fB nsPID \*(Em PID namespace \fR
The Inode of the namespace used to isolate process ID numbers The Inode of the namespace used to isolate process ID numbers
meaning they need not remain unique. meaning they need not remain unique.
Thus, each such namespace could have its own `init/systemd' (PID #1) to Thus, each such namespace could have its own `init/systemd' (PID #1) to
manage various initialization tasks and reap orphaned child processes. manage various initialization tasks and reap orphaned child processes.
.TP 4 .TP 4
62.\fB nsUSER \*(Em USER namespace \fR 63.\fB nsUSER \*(Em USER namespace \fR
The Inode of the namespace used to isolate the user and group ID numbers. The Inode of the namespace used to isolate the user and group ID numbers.
Thus, a process could have a normal unprivileged user ID outside a user Thus, a process could have a normal unprivileged user ID outside a user
namespace while having a user ID of 0, with full root privileges, inside namespace while having a user ID of 0, with full root privileges, inside
that namespace. that namespace.
.TP 4 .TP 4
63.\fB nsUTS \*(Em UTS namespace \fR 64.\fB nsUTS \*(Em UTS namespace \fR
The Inode of the namespace used to isolate hostname and NIS domain name. The Inode of the namespace used to isolate hostname and NIS domain name.
UTS simply means "UNIX Time-sharing System". UTS simply means "UNIX Time-sharing System".
.TP 4 .TP 4
64.\fB vMj \*(Em Major Page Fault Count Delta\fR 65.\fB vMj \*(Em Major Page Fault Count Delta\fR
The number of\fB major\fR page faults that have occurred since the The number of\fB major\fR page faults that have occurred since the
last update (see nMaj). last update (see nMaj).
.TP 4 .TP 4
65.\fB vMn \*(Em Minor Page Fault Count Delta\fR 66.\fB vMn \*(Em Minor Page Fault Count Delta\fR
The number of\fB minor\fR page faults that have occurred since the The number of\fB minor\fR page faults that have occurred since the
last update (see nMin). last update (see nMin).

8
top/top.c
View File

@ -1676,8 +1676,9 @@ static struct {
{ 6, SK_Kb, A_right, PIDS_SMAP_PSS }, // ul_int EU_PSS { 6, SK_Kb, A_right, PIDS_SMAP_PSS }, // ul_int EU_PSS
{ 6, SK_Kb, A_right, PIDS_SMAP_PSS_ANON }, // ul_int EU_PZA { 6, SK_Kb, A_right, PIDS_SMAP_PSS_ANON }, // ul_int EU_PZA
{ 6, SK_Kb, A_right, PIDS_SMAP_PSS_FILE }, // ul_int EU_PZF { 6, SK_Kb, A_right, PIDS_SMAP_PSS_FILE }, // ul_int EU_PZF
{ 6, SK_Kb, A_right, PIDS_SMAP_PSS_SHMEM } // ul_int EU_PZS { 6, SK_Kb, A_right, PIDS_SMAP_PSS_SHMEM }, // ul_int EU_PZS
#define eu_LAST EU_PZS { 6, SK_Kb, A_right, PIDS_SMAP_PRV_TOTAL } // ul_int EU_USS
#define eu_LAST EU_USS
// xtra Fieldstab 'pseudo pflag' entries for the newlib interface . . . . . . . // xtra Fieldstab 'pseudo pflag' entries for the newlib interface . . . . . . .
#define eu_CMDLINE eu_LAST +1 #define eu_CMDLINE eu_LAST +1
#define eu_TICS_ALL_C eu_LAST +2 #define eu_TICS_ALL_C eu_LAST +2
@ -2320,7 +2321,7 @@ static void zap_fieldstab (void) {
= Fieldstab[EU_RZS].scale = Fieldstab[EU_RSS].scale = Fieldstab[EU_RZS].scale = Fieldstab[EU_RSS].scale
= Fieldstab[EU_PSS].scale = Fieldstab[EU_PZA].scale = Fieldstab[EU_PSS].scale = Fieldstab[EU_PZA].scale
= Fieldstab[EU_PZF].scale = Fieldstab[EU_PZS].scale = Fieldstab[EU_PZF].scale = Fieldstab[EU_PZS].scale
= Rc.task_mscale; = Fieldstab[EU_USS].scale = Rc.task_mscale;
// lastly, ensure we've got proper column headers... // lastly, ensure we've got proper column headers...
calibrate_fields(); calibrate_fields();
@ -5900,6 +5901,7 @@ static const char *task_show (const WIN_t *q, struct pids_stack *p) {
case EU_SHR: // PIDS_MEM_SHR case EU_SHR: // PIDS_MEM_SHR
case EU_SWP: // PIDS_VM_SWAP case EU_SWP: // PIDS_VM_SWAP
case EU_USE: // PIDS_VM_USED case EU_USE: // PIDS_VM_USED
case EU_USS: // PIDS_SMAP_PRV_TOTAL
case EU_VRT: // PIDS_MEM_VIRT case EU_VRT: // PIDS_MEM_VIRT
cp = scale_mem(S, rSv(i, ul_int), W, Jn); cp = scale_mem(S, rSv(i, ul_int), W, Jn);
break; break;

2
top/top.h
View File

@ -189,7 +189,7 @@ enum pflag {
EU_NMA, EU_NMA,
EU_LID, EU_LID,
EU_EXE, EU_EXE,
EU_RSS, EU_PSS, EU_PZA, EU_PZF, EU_PZS, EU_RSS, EU_PSS, EU_PZA, EU_PZF, EU_PZS, EU_USS,
#ifdef USE_X_COLHDR #ifdef USE_X_COLHDR
// not really pflags, used with tbl indexing // not really pflags, used with tbl indexing
EU_MAXPFLGS EU_MAXPFLGS

5
top/top_nls.c
View File

@ -322,13 +322,16 @@ static void build_two_nlstabs (void) {
Desc_nlstab[EU_PSS] = _("Proportion RSS, KiB"); Desc_nlstab[EU_PSS] = _("Proportion RSS, KiB");
/* Translation Hint: maximum 'PSan' = 6 */ /* Translation Hint: maximum 'PSan' = 6 */
Head_nlstab[EU_PZA] = _("PSan"); Head_nlstab[EU_PZA] = _("PSan");
Desc_nlstab[EU_PZA] = _("Proportion Anon. KiB"); Desc_nlstab[EU_PZA] = _("Proportion Anon, KiB");
/* Translation Hint: maximum 'PSfd' = 6 */ /* Translation Hint: maximum 'PSfd' = 6 */
Head_nlstab[EU_PZF] = _("PSfd"); Head_nlstab[EU_PZF] = _("PSfd");
Desc_nlstab[EU_PZF] = _("Proportion File, KiB"); Desc_nlstab[EU_PZF] = _("Proportion File, KiB");
/* Translation Hint: maximum 'PSsh' = 6 */ /* Translation Hint: maximum 'PSsh' = 6 */
Head_nlstab[EU_PZS] = _("PSsh"); Head_nlstab[EU_PZS] = _("PSsh");
Desc_nlstab[EU_PZS] = _("Proportion Shrd, KiB"); Desc_nlstab[EU_PZS] = _("Proportion Shrd, KiB");
/* Translation Hint: maximum 'USS' = 6 */
Head_nlstab[EU_USS] = _("USS");
Desc_nlstab[EU_USS] = _("Unique RSS, KiB");
} }