summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Warner <james.warner@comcast.net>2022-09-18 00:00:00 -0500
committerCraig Small <csmall@dropbear.xyz>2022-09-20 18:50:55 +1000
commite5386f1f217989c9e62188111891cb43ec11a244 (patch)
tree382b2707dff13c60d8f684c03f045266e426edb2
parent5c5bff392bfaf78b7bacb9b954c1fd1e9d818544 (diff)
downloadprocps-ng-e5386f1f217989c9e62188111891cb43ec11a244.tar.gz
top: harden detailed stats two abreast summary display
When displaying detailed cpu statistics, as opposed to those scalable graphs, only two per line can be shown. Therefore, if we are showing a detail version, our '4' toggle must prematurely revert to single mode display. Conversely, the 't' toggle must also turn off that '4' toggle rather than try to print more than 2 abreast if we're currently executing in detailed statistics mode. Signed-off-by: Jim Warner <james.warner@comcast.net>
-rw-r--r--src/top/top.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/top/top.c b/src/top/top.c
index 7a1bc5e..bf1fd0f 100644
--- a/src/top/top.c
+++ b/src/top/top.c
@@ -5727,6 +5727,9 @@ static void keys_summary (int ch) {
if ((w->rc.double_up >= ADJOIN_limit)
|| ((w->rc.double_up >= Cpu_cnt)))
w->rc.double_up = 0;
+ if ((w->rc.double_up > 1)
+ && (!w->rc.graph_cpus))
+ w->rc.double_up = 0;
OFFw(w, (View_CPUSUM | View_CPUNOD));
break;
case 'C':
@@ -5750,6 +5753,9 @@ static void keys_summary (int ch) {
w->rc.graph_cpus = 0;
OFFw(w, View_STATES);
}
+ if ((w->rc.double_up > 1)
+ && (!w->rc.graph_cpus))
+ w->rc.double_up = 0;
break;
default: // keep gcc happy
break;