top: change number of emulated cpus from four to eight

With the addition of NUMA/Node support and the ability
to emulate such support even in the absence of libnuma
and numa.h, the maximum number of cpus top can emulate
was increased to make numa emulation more interesting.

( whew, that's an awful lot of "emulates", me thinks )

Reference(s):
commit 8d989c68c068541a814bf0d2340ac9b0373f24b5

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/top/top.c b/top/top.c
index 4c8a754827784237ea242eeb4fe23b8434124807..9dedf08ec9b47492158908a77b9ae3e9038c6182 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -2363,7 +2363,7 @@ static CPU_t *cpus_refresh (CPU_t *cpus) {
 #else
    for (i = 0; i < sumSLOT && i < Screen_rows; i++) {
 #endif
-#ifdef PRETEND4CPUS
+#ifdef PRETEND8CPUS
       rewind(fp);
       fgets(buf, sizeof(buf), fp);
 #endif
@@ -2384,7 +2384,7 @@ static CPU_t *cpus_refresh (CPU_t *cpus) {
       // this is for symmetry only, it's not currently required
       cpus[i].cur.tot = cpus[sumSLOT].cur.tot;
 #endif
-#ifdef PRETEND4CPUS
+#ifdef PRETEND8CPUS
       cpus[i].id = i;
 #endif
 #ifdef NUMA_ENABLED
@@ -2631,7 +2631,7 @@ static void sysinfo_refresh (int forced) {
       meminfo();
       mem_secs = cur_secs;
    }
-#ifndef PRETEND4CPUS
+#ifndef PRETEND8CPUS
    /*** hotplug_acclimated ***/
    if (300 <= cur_secs - cpu_secs) {
       cpuinfo();
@@ -3202,8 +3202,8 @@ static void before (char *me) {
    initialize_nls();
 
    // establish cpu particulars
-#ifdef PRETEND4CPUS
-   smp_num_cpus = 4;
+#ifdef PRETEND8CPUS
+   smp_num_cpus = 8;
 #endif
    Cpu_faux_tot = smp_num_cpus;
    Cpu_States_fmts = N_unq(STATE_lin2x4_fmt);

diff --git a/top/top.h b/top/top.h
index e83993e21ccf80e8a24159b00e9597be2fa431b1..ace057853f90b3bb3be01936f709e560d5f98949 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -43,7 +43,7 @@
 //#define OFF_HST_HASH            /* use BOTH qsort+bsrch vs. hashing scheme */
 //#define OFF_STDIOLBF            /* disable our own stdout _IOFBF override  */
 //#define PRETEND2_5_X            /* pretend we're linux 2.5.x (for IO-wait) */
-//#define PRETEND4CPUS            /* pretend we're smp with 4 ticsers (sic)  */
+//#define PRETEND8CPUS            /* pretend we're smp with 8 ticsers (sic)  */
 //#define PRETENDNOCAP            /* use a terminal without essential caps   */
 //#define PRETEND_NUMA            /* pretend we've got some linux NUMA Nodes */
 //#define RCFILE_NOERR            /* rcfile errs silently default, vs. fatal */