From 1db14dafd95e29b1d9aca5dc1775598aabc0a24b Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Wed, 11 Jan 2023 00:00:00 -0600 Subject: [PATCH] top: include the '5' toggle on the primary help screen When the p/e-cores support (via the '5' key) was added in the patch referenced below, I intentionally omitted that key from the top primary help screen. This seemed appropriate since it only applied to select Intel cpus and, besides, that screen was getting kind of crowded. [ it remains an objective to fit on a 80x24 terminal ] Upon reflection, I found a way to squeeze it into that help screen and have decided to included it. Hopefully its presence will encourage use of top's new provision on any Intel platforms that distinguish between cores. Reference(s): Sep, 2022 - exploit p/e-cores provision commit 00f5c74b1bc583d37315fa094c6f50cef7961c0c Signed-off-by: Jim Warner --- NEWS | 3 ++- src/top/top_nls.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index d23922af..a6739877 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ procps-ng-NEXT * docs: Don't install English manpages twice * ps: c flag shows command name again Debian #1026326 * skill: Match on -p again Debian #1025915 + * top: E/P-core toggle ('5' key) added to help * vmstat: Referesh memory statistics Debian #1027963 procps-ng-4.0.2 @@ -10,7 +11,7 @@ procps-ng-4.0.2 * library revision - 0:1:0 Handle absent 'core_id' in /proc/cpuinfo * w: Show time with D_TIME_BITS=64 on 32bit env issue #256 - + procps-ng-4.0.1 --------------- * library diff --git a/src/top/top_nls.c b/src/top/top_nls.c index fbe2d44d..f3f88852 100644 --- a/src/top/top_nls.c +++ b/src/top/top_nls.c @@ -663,8 +663,8 @@ static void build_uniq_nlstab (void) { "Window ~1%s~6: ~1Cumulative mode ~3%s~2. ~1System~6: ~1Delay ~3%.1f secs~2; ~1Secure mode ~3%s~2.\n" "\n" " Z~5,~1B~5,E,e Global: '~1Z~2' colors; '~1B~2' bold; '~1E~2'/'~1e~2' summary/task memory scale\n" - " l,t,m,I Toggle: '~1l~2' load avg; '~1t~2' task/cpu; '~1m~2' memory; '~1I~2' Irix mode\n" - " 0,1,2,3,4 Toggle: '~10~2' zeros; '~11~2/~12~2/~13~2' cpu/numa views; '~14~2' cpus two abreast\n" + " l,t,m,I,0 Toggle: '~1l~2' load avg; '~1t~2' task/cpu; '~1m~2' memory; '~1I~2' Irix; '~10~2' zeros\n" + " 1,2,3,4,5 Toggle: '~11~2/~12~2/~13~2' cpu/numa views; '~14~2' cpus abreast; '~15~2' P/E-cores\n" " f,X Fields: '~1f~2' add/remove/order/sort; '~1X~2' increase fixed-width fields\n" "\n" " L,&,<,> . Locate: '~1L~2'/'~1&~2' find/again; Move sort column: '~1<~2'/'~1>~2' left/right\n"