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

top: remove explicit references to NUMA_DISABLE define

Browse Source 
Since our library is responsible for NUMA support, and
since the top program already accommodates the lack of
NUMA data, there's no reason that #define NUMA_DISABLE
need be explicitly referenced in the top source files.

Ergo, this commit just eliminates all such references.
Now, top will rely only on procps_stat_reap() results.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2016-09-17 01:11:11 -05:00 committed by Craig Small
parent b9050f69a0
commit a5ec5efc9a
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
top/top.c
View File

@ -2163,10 +2163,9 @@ static void cpus_refresh (void) {
enum stat_reap_type which; enum stat_reap_type which;
which = STAT_REAP_CPUS_ONLY; which = STAT_REAP_CPUS_ONLY;
#ifndef NUMA_DISABLE
if (CHKw(Curwin, View_CPUNOD)) if (CHKw(Curwin, View_CPUNOD))
which = STAT_REAP_CPUS_AND_NODES; which = STAT_REAP_CPUS_AND_NODES;
#endif
Stat_reap = procps_stat_reap(Stat_ctx, which, Stat_items, MAXTBL(Stat_items)); Stat_reap = procps_stat_reap(Stat_ctx, which, Stat_items, MAXTBL(Stat_items));
if (!Stat_reap) if (!Stat_reap)
error_exit(fmtmk(N_fmt(LIB_errorcpu_fmt),__LINE__)); error_exit(fmtmk(N_fmt(LIB_errorcpu_fmt),__LINE__));
@ -2785,10 +2784,10 @@ signify_that:
* No matter what *they* say, we handle the really really BIG and * No matter what *they* say, we handle the really really BIG and
* IMPORTANT stuff upon which all those lessor functions depend! */ * IMPORTANT stuff upon which all those lessor functions depend! */
static void before (char *me) { static void before (char *me) {
enum stat_reap_type which;
struct sigaction sa; struct sigaction sa;
int i; int i;
int linux_version_code = procps_linux_version(); int linux_version_code = procps_linux_version();
enum stat_reap_type which = STAT_REAP_CPUS_AND_NODES;
atexit(close_stdout); atexit(close_stdout);
@ -2819,11 +2818,7 @@ static void before (char *me) {
if (linux_version_code >= LINUX_VERSION(2, 6, 11)) if (linux_version_code >= LINUX_VERSION(2, 6, 11))
Cpu_States_fmts = N_unq(STATE_lin2x7_fmt); Cpu_States_fmts = N_unq(STATE_lin2x7_fmt);
// get the total cpus (and, if possible, max numa node number) // get the total cpus (and, if possible, numa node total)
which = STAT_REAP_CPUS_ONLY;
#ifndef NUMA_DISABLE
which = STAT_REAP_CPUS_AND_NODES;
#endif
if (procps_stat_new(&Stat_ctx) < 0 if (procps_stat_new(&Stat_ctx) < 0
|| !(Stat_reap = procps_stat_reap(Stat_ctx, which, Stat_items, MAXTBL(Stat_items)))) || !(Stat_reap = procps_stat_reap(Stat_ctx, which, Stat_items, MAXTBL(Stat_items))))
error_exit(fmtmk(N_fmt(LIB_errorcpu_fmt),__LINE__)); error_exit(fmtmk(N_fmt(LIB_errorcpu_fmt),__LINE__));
@ -4685,9 +4680,7 @@ static void summary_show (void) {
cpus_refresh(); cpus_refresh();
#ifndef NUMA_DISABLE
if (!Numa_node_tot) goto numa_nope; if (!Numa_node_tot) goto numa_nope;
if (CHKw(w, View_CPUNOD)) { if (CHKw(w, View_CPUNOD)) {
if (Numa_node_sel < 0) { if (Numa_node_sel < 0) {
numa_oops: numa_oops:
@ -4721,8 +4714,8 @@ numa_oops:
} }
} }
} else } else
numa_nope: numa_nope:
#endif
if (CHKw(w, View_CPUSUM)) { if (CHKw(w, View_CPUSUM)) {
// display just the 1st /proc/stat line // display just the 1st /proc/stat line
summary_hlp(Stat_reap->summary, N_txt(WORD_allcpus_txt)); summary_hlp(Stat_reap->summary, N_txt(WORD_allcpus_txt));

1
top/top.h
View File

@ -25,7 +25,6 @@
/* Defines represented in configure.ac ----------------------------- */ /* Defines represented in configure.ac ----------------------------- */
//#define BOOST_PERCNT /* enable extra precision for two % fields */ //#define BOOST_PERCNT /* enable extra precision for two % fields */
//#define NOBOOST_MEMS /* disable extra precision for mem fields */ //#define NOBOOST_MEMS /* disable extra precision for mem fields */
//#define NUMA_DISABLE /* disable summary area NUMA/Nodes display */
//#define ORIG_TOPDEFS /* with no rcfile retain original defaults */ //#define ORIG_TOPDEFS /* with no rcfile retain original defaults */
//#define SIGNALS_LESS /* favor reduced signal load over response */ //#define SIGNALS_LESS /* favor reduced signal load over response */