From nobody Sun Jan 02 03:48:27 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2796D19266AE; Sun, 2 Jan 2022 03:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JRPx757Npz4gjS; Sun, 2 Jan 2022 03:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 906EB2D36; Sun, 2 Jan 2022 03:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2023mRb9030807; Sun, 2 Jan 2022 03:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2023mRU1030806; Sun, 2 Jan 2022 03:48:27 GMT (envelope-from git) Date: Sun, 2 Jan 2022 03:48:27 GMT Message-Id: <202201020348.2023mRU1030806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: a115a4aa51ae - main - systat -vm: Humanize output for ease of reading. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a115a4aa51ae891330c9c4404dd4df13b601556f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641095307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tW/Ux7S9ac/XGTzLpbAI9FdLRN9UVZIGTHHVDPPJ1T8=; b=abKkji/X2nQUM3WcVg6/loG57AoM5kVPuvo/DqRXpF5WTAj1D6WPbW+tNiia6RyLNbDN0K 8NLcdnF+NE2NJrhz5ipLyxcU36BkvtdUg/k8qOpqlV0QqivcQI7ji2bSAw2kjduPkKahUG Sq4sHkBoHJR1CvzUBCc0ihqkyebdMKDZgh9O+tlrwlUNdrOr/3kpEzlj74S991Ks6z/ACH DiFqnFhPiu7t9La7aBsSzBA7k1ekYMg24NurxL6tJ+uz/vXs73laNwC11tWHOXiYCLvrBB 8b3GZ3+GB82mvpFtOxc4LbHDr/hFsUIJuCE+bB0HqZAPZp8N6cpDhjG9X71REQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641095307; a=rsa-sha256; cv=none; b=oxetuCUtKOTkQqzcZOaTre3fUgh5W1YcgS+i7D6EUfnGnelSRxRo7ahpRAkhdldZg6HOtp kxFhWmELp5O6l01XZv72HALrYHPmvju5UdzkWstjZ1NHaGZc5jFfWsMSqbqot53IBVgRsT zowNbsNJExFevONwaAGhzNU8+TG+T0xrbkDzuZBIHvkwqN5rjOhlGyQE2Oyvdo30U8D39m x4TgFvINFYicWcYS0PAhbgYJUMZwKde/k8MCO2V624LW7yeYamcWoyUOkFZwCtFoG9ehxf tqteTZsxKnrVmoWCcwn33pm13av3tk0VJ6nPK5B7YNHMrfwyfHDUGnexAh0uYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=a115a4aa51ae891330c9c4404dd4df13b601556f commit a115a4aa51ae891330c9c4404dd4df13b601556f Author: Kirk McKusick AuthorDate: 2022-01-02 03:47:27 +0000 Commit: Kirk McKusick CommitDate: 2022-01-02 03:48:06 +0000 systat -vm: Humanize output for ease of reading. Using 8 width is too wide for large numbers like 1379991K; 1330M is easier to read. Submitted by: ota_j.email.ne.jp Reviewed by: mckusick MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D33495 --- usr.bin/systat/vmstat.c | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index 57697284a6ab..a02674ce64a6 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -180,7 +180,7 @@ closekre(WINDOW *w) #define GENSTATROW 7 /* uses 2 rows and 29 cols */ #define GENSTATCOL 22 #define VMSTATROW 5 /* uses 17 rows and 12-14 cols */ -#define VMSTATCOL 49 /* actually 50-51 for some fields */ +#define VMSTATCOL 52 #define GRAPHROW 10 /* uses 3 rows and 49-51 cols */ #define GRAPHCOL 0 #define VNSTATROW 13 /* uses 4 rows and 13 columns */ @@ -317,25 +317,25 @@ labelkre(void) mvprintw(INTSROW, INTSCOL + 1, "Interrupts"); mvprintw(INTSROW + 1, INTSCOL + 6, "total"); - mvprintw(VMSTATROW, VMSTATCOL + 9, "ioflt"); - mvprintw(VMSTATROW + 1, VMSTATCOL + 9, "cow"); - mvprintw(VMSTATROW + 2, VMSTATCOL + 9, "zfod"); - mvprintw(VMSTATROW + 3, VMSTATCOL + 9, "ozfod"); - mvprintw(VMSTATROW + 4, VMSTATCOL + 9 - 1, "%%ozfod"); - mvprintw(VMSTATROW + 5, VMSTATCOL + 9, "daefr"); - mvprintw(VMSTATROW + 6, VMSTATCOL + 9, "prcfr"); - mvprintw(VMSTATROW + 7, VMSTATCOL + 9, "totfr"); - mvprintw(VMSTATROW + 8, VMSTATCOL + 9, "react"); - mvprintw(VMSTATROW + 9, VMSTATCOL + 9, "pdwak"); - mvprintw(VMSTATROW + 10, VMSTATCOL + 9, "pdpgs"); - mvprintw(VMSTATROW + 11, VMSTATCOL + 9, "intrn"); - mvprintw(VMSTATROW + 12, VMSTATCOL + 9, "wire"); - mvprintw(VMSTATROW + 13, VMSTATCOL + 9, "act"); - mvprintw(VMSTATROW + 14, VMSTATCOL + 9, "inact"); - mvprintw(VMSTATROW + 15, VMSTATCOL + 9, "laund"); - mvprintw(VMSTATROW + 16, VMSTATCOL + 9, "free"); + mvprintw(VMSTATROW, VMSTATCOL + 6, "ioflt"); + mvprintw(VMSTATROW + 1, VMSTATCOL + 6, "cow"); + mvprintw(VMSTATROW + 2, VMSTATCOL + 6, "zfod"); + mvprintw(VMSTATROW + 3, VMSTATCOL + 6, "ozfod"); + mvprintw(VMSTATROW + 4, VMSTATCOL + 6 - 1, "%%ozfod"); + mvprintw(VMSTATROW + 5, VMSTATCOL + 6, "daefr"); + mvprintw(VMSTATROW + 6, VMSTATCOL + 6, "prcfr"); + mvprintw(VMSTATROW + 7, VMSTATCOL + 6, "totfr"); + mvprintw(VMSTATROW + 8, VMSTATCOL + 6, "react"); + mvprintw(VMSTATROW + 9, VMSTATCOL + 6, "pdwak"); + mvprintw(VMSTATROW + 10, VMSTATCOL + 6, "pdpgs"); + mvprintw(VMSTATROW + 11, VMSTATCOL + 6, "intrn"); + mvprintw(VMSTATROW + 12, VMSTATCOL + 6, "wire"); + mvprintw(VMSTATROW + 13, VMSTATCOL + 6, "act"); + mvprintw(VMSTATROW + 14, VMSTATCOL + 6, "inact"); + mvprintw(VMSTATROW + 15, VMSTATCOL + 6, "laund"); + mvprintw(VMSTATROW + 16, VMSTATCOL + 6, "free"); if (LINES - 1 > VMSTATROW + 17) - mvprintw(VMSTATROW + 17, VMSTATCOL + 9, "buf"); + mvprintw(VMSTATROW + 17, VMSTATCOL + 6, "buf"); mvprintw(GENSTATROW, GENSTATCOL, " Csw Trp Sys Int Sof Flt"); @@ -471,26 +471,26 @@ showkre(void) putint(total.t_dw, PROCSROW + 2, PROCSCOL + 8, 3); putint(total.t_sl, PROCSROW + 2, PROCSCOL + 12, 4); putint(total.t_sw, PROCSROW + 2, PROCSCOL + 17, 3); - PUTRATE(v_io_faults, VMSTATROW, VMSTATCOL + 2, 8 - 2); - PUTRATE(v_cow_faults, VMSTATROW + 1, VMSTATCOL + 2, 8 - 2); - PUTRATE(v_zfod, VMSTATROW + 2, VMSTATCOL + 2, 8 - 2); - PUTRATE(v_ozfod, VMSTATROW + 3, VMSTATCOL, 8); + PUTRATE(v_io_faults, VMSTATROW, VMSTATCOL, 5); + PUTRATE(v_cow_faults, VMSTATROW + 1, VMSTATCOL, 5); + PUTRATE(v_zfod, VMSTATROW + 2, VMSTATCOL, 5); + PUTRATE(v_ozfod, VMSTATROW + 3, VMSTATCOL, 5); putint(s.v_zfod != 0 ? (int)(s.v_ozfod * 100.0 / s.v_zfod) : 0, - VMSTATROW + 4, VMSTATCOL + 1, 8 - 1); - PUTRATE(v_dfree, VMSTATROW + 5, VMSTATCOL + 2, 8 - 2); - PUTRATE(v_pfree, VMSTATROW + 6, VMSTATCOL + 2, 8 - 2); - PUTRATE(v_tfree, VMSTATROW + 7, VMSTATCOL, 8); - PUTRATE(v_reactivated, VMSTATROW + 8, VMSTATCOL, 8); - PUTRATE(v_pdwakeups, VMSTATROW + 9, VMSTATCOL, 8); - PUTRATE(v_pdpages, VMSTATROW + 10, VMSTATCOL, 8); - PUTRATE(v_intrans, VMSTATROW + 11, VMSTATCOL, 8); - sysputpage(wnd, VMSTATROW + 12, VMSTATCOL + 2, 8 - 2, s.v_wire_count, 0); - sysputpage(wnd, VMSTATROW + 13, VMSTATCOL + 2, 8 - 2, s.v_active_count, 0); - sysputpage(wnd, VMSTATROW + 14, VMSTATCOL + 2, 8 - 2, s.v_inactive_count, 0); - sysputpage(wnd, VMSTATROW + 15, VMSTATCOL + 2, 8 - 2, s.v_laundry_count, 0); - sysputpage(wnd, VMSTATROW + 16, VMSTATCOL + 2, 8 - 2, s.v_free_count, 0); + VMSTATROW + 4, VMSTATCOL, 5); + PUTRATE(v_dfree, VMSTATROW + 5, VMSTATCOL, 5); + PUTRATE(v_pfree, VMSTATROW + 6, VMSTATCOL, 5); + PUTRATE(v_tfree, VMSTATROW + 7, VMSTATCOL, 5); + PUTRATE(v_reactivated, VMSTATROW + 8, VMSTATCOL, 5); + PUTRATE(v_pdwakeups, VMSTATROW + 9, VMSTATCOL, 5); + PUTRATE(v_pdpages, VMSTATROW + 10, VMSTATCOL, 5); + PUTRATE(v_intrans, VMSTATROW + 11, VMSTATCOL, 5); + sysputpage(wnd, VMSTATROW + 12, VMSTATCOL, 5, s.v_wire_count, 0); + sysputpage(wnd, VMSTATROW + 13, VMSTATCOL, 5, s.v_active_count, 0); + sysputpage(wnd, VMSTATROW + 14, VMSTATCOL, 5, s.v_inactive_count, 0); + sysputpage(wnd, VMSTATROW + 15, VMSTATCOL, 5, s.v_laundry_count, 0); + sysputpage(wnd, VMSTATROW + 16, VMSTATCOL, 5, s.v_free_count, 0); if (LINES - 1 > VMSTATROW + 17) - sysputuint64(wnd, VMSTATROW + 17, VMSTATCOL + 2, 8 - 2, s.bufspace, 0); + sysputuint64(wnd, VMSTATROW + 17, VMSTATCOL, 5, s.bufspace, 0); PUTRATE(v_vnodein, PAGEROW + 2, PAGECOL + 6, 5); PUTRATE(v_vnodeout, PAGEROW + 2, PAGECOL + 12, 5); PUTRATE(v_swapin, PAGEROW + 2, PAGECOL + 19, 5);