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

ps: have now added the NUMA node field display support

Browse Source 
Reference(s):
https://gitlab.com/procps-ng/procps/issues/58

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2017-05-12 00:05:00 -05:00 committed by Craig Small
parent 6002603e2c
commit fd95a61652
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ps/common.h
View File

@ -113,6 +113,7 @@ makEXT(NS_USER)
makEXT(NS_UTS) makEXT(NS_UTS)
makEXT(PRIORITY) makEXT(PRIORITY)
makEXT(PROCESSOR) makEXT(PROCESSOR)
makEXT(PROCESSOR_NODE)
makEXT(RSS) makEXT(RSS)
makEXT(RSS_RLIM) makEXT(RSS_RLIM)
makEXT(RTPRIO) makEXT(RTPRIO)

1
ps/global.c
View File

@ -103,6 +103,7 @@ makREL(NS_USER)
makREL(NS_UTS) makREL(NS_UTS)
makREL(PRIORITY) makREL(PRIORITY)
makREL(PROCESSOR) makREL(PROCESSOR)
makREL(PROCESSOR_NODE)
makREL(RSS) makREL(RSS)
makREL(RSS_RLIM) makREL(RSS_RLIM)
makREL(RTPRIO) makREL(RTPRIO)

6
ps/output.c
View File

@ -853,6 +853,11 @@ setREL1(PROCESSOR)
return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR, u_int, pp)); return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR, u_int, pp));
} }
static int pr_numa(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(PROCESSOR_NODE)
return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR_NODE, s_int, pp));
}
static int pr_rss(char *restrict const outbuf, const proc_t *restrict const pp){ static int pr_rss(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(VM_RSS) setREL1(VM_RSS)
return snprintf(outbuf, COLWID, "%lu", rSv(VM_RSS, ul_int, pp)); return snprintf(outbuf, COLWID, "%lu", rSv(VM_RSS, ul_int, pp));
@ -1449,6 +1454,7 @@ static const format_struct format_array[] = { /*
{"nsignals", "NSIGS", pr_nop, PIDS_noop, 5, DEC, AN|RIGHT}, /*nsigs*/ {"nsignals", "NSIGS", pr_nop, PIDS_noop, 5, DEC, AN|RIGHT}, /*nsigs*/
{"nsigs", "NSIGS", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT}, /*nsignals*/ {"nsigs", "NSIGS", pr_nop, PIDS_noop, 5, BSD, AN|RIGHT}, /*nsignals*/
{"nswap", "NSWAP", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT}, {"nswap", "NSWAP", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT},
{"numa", "NUMA", pr_numa, PIDS_PROCESSOR_NODE, 4, XXX, AN|RIGHT},
{"nvcsw", "VCSW", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT}, {"nvcsw", "VCSW", pr_nop, PIDS_noop, 5, XXX, AN|RIGHT},
{"nwchan", "WCHAN", pr_nop, PIDS_noop, 6, XXX, TO|RIGHT}, {"nwchan", "WCHAN", pr_nop, PIDS_noop, 6, XXX, TO|RIGHT},
{"opri", "PRI", pr_opri, PIDS_PRIORITY, 3, SUN, TO|RIGHT}, {"opri", "PRI", pr_opri, PIDS_PRIORITY, 3, SUN, TO|RIGHT},

7
ps/ps.1
View File

@ -4,7 +4,7 @@
.\" Quick hack conversion by Albert Cahalan, 1998. .\" Quick hack conversion by Albert Cahalan, 1998.
.\" Licensed under version 2 of the Gnu General Public License. .\" Licensed under version 2 of the Gnu General Public License.
.\" .\"
.TH PS 1 "August 2015" "procps-ng" "User Commands" .TH PS 1 "May 2017" "procps-ng" "User Commands"
.\" .\"
.\" To render this page: .\" To render this page:
.\" groff -t -b -man -X -P-resolution -P100 -Tps ps.1 & .\" groff -t -b -man -X -P-resolution -P100 -Tps ps.1 &
@ -1379,6 +1379,11 @@ number of lwps (threads) in the process. (alias
.BR thcount ). .BR thcount ).
T} T}
numa NUMA T{
The node assocated with the most recently used processor.
A -1 means that NUMA information is unavailable.
T}
nwchan WCHAN T{ nwchan WCHAN T{
address of the kernel function where the process is sleeping (use address of the kernel function where the process is sleeping (use
.B wchan .B wchan