]> granicus.if.org Git - procps-ng/commitdiff
top: whack a label & branch in 'summary_show' function
authorJim Warner <james.warner@comcast.net>
Mon, 23 Aug 2021 05:00:00 +0000 (00:00 -0500)
committerCraig Small <csmall@dropbear.xyz>
Tue, 24 Aug 2021 10:53:27 +0000 (20:53 +1000)
Catch-up with newlib, original commit message follows:
------------------------------------------------------

If there are zero numa nodes then the View_CPUNOD flag
cannot possibly be set. So it was unnecessary to check
both the numa total and View_CPUNOD in 'summary_show'.

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

index 3d654b76b48c0d3909112681ecb3a7389165bcae..9762e092e99725d14fdb969927ce17735cd2555c 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -6039,8 +6039,6 @@ static void summary_show (void) {
 
       cpus_refresh();
 
-      if (!Numa_node_tot) goto numa_nope;
-
       if (CHKw(w, View_CPUNOD)) {
          if (Numa_node_sel < 0) {
             // display the 1st /proc/stat line, then the nodes (if room)
@@ -6074,11 +6072,11 @@ static void summary_show (void) {
                }
             }
          }
-      } else
-numa_nope:
-      if (CHKw(w, View_CPUSUM)) {
+
+      } else if (CHKw(w, View_CPUSUM)) {
          // display just the 1st /proc/stat line
          Msg_row += sum_tics(&Cpu_tics[smp_num_cpus], N_txt(WORD_allcpus_txt), 1);
+
       } else {
          // display each cpu's states separately, screen height permitting...
          if (w->rc.combine_cpus) {