Commit 00820351 authored by jim warner's avatar jim warner Committed by Craig Small

ps: have now added the NUMA node field display support

[ this patch has been adapted from the newlib branch ]

Reference(s):
#58Signed-off-by: jim warner's avatarJim Warner <[email protected]>
parent 1422c219
......@@ -70,6 +70,7 @@
#include "../proc/procps.h"
#include "../proc/devname.h"
#include "../proc/escape.h"
#include "../proc/numa.h"
#include "common.h"
......@@ -975,6 +976,12 @@ static int pr_psr(char *restrict const outbuf, const proc_t *restrict const pp){
return snprintf(outbuf, COLWID, "%d", pp->processor);
}
static int pr_numa(char *restrict const outbuf, const proc_t *restrict const pp){
static int first = 1;
if (first) { numa_init(); first = 0; } // we'll keep this dependency local
return snprintf(outbuf, COLWID, "%d", numa_node_of_cpu(pp->processor));
}
static int pr_rss(char *restrict const outbuf, const proc_t *restrict const pp){
return snprintf(outbuf, COLWID, "%lu", pp->vm_rss);
}
......@@ -1545,6 +1552,7 @@ static const format_struct format_array[] = {
{"nsignals", "NSIGS", pr_nop, sr_nop, 5, 0, DEC, AN|RIGHT}, /*nsigs*/
{"nsigs", "NSIGS", pr_nop, sr_nop, 5, 0, BSD, AN|RIGHT}, /*nsignals*/
{"nswap", "NSWAP", pr_nop, sr_nop, 5, 0, XXX, AN|RIGHT},
{"numa", "NUMA", pr_numa, sr_nop, 4, 0, XXX, AN|RIGHT},
{"nvcsw", "VCSW", pr_nop, sr_nop, 5, 0, XXX, AN|RIGHT},
{"nwchan", "WCHAN", pr_nwchan, sr_nop, 6, 0, XXX, TO|RIGHT},
{"opri", "PRI", pr_opri, sr_priority, 3, 0, SUN, TO|RIGHT},
......
......@@ -4,7 +4,7 @@
.\" Quick hack conversion by Albert Cahalan, 1998.
.\" 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:
.\" 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 ).
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{
address of the kernel function where the process is sleeping (use
.B wchan
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment