From nobody Wed Dec 06 20:01:25 2023 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 4SlpFK671fz52tPP; Wed, 6 Dec 2023 20:01:25 +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 4SlpFK5hbdz3M5v; Wed, 6 Dec 2023 20:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701892885; 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=He/94OuuqRbhfGRkygt2MIoT6vvZD842ZQDzuVuGZ20=; b=U5p1fX21oOMhf6QC9TxVM5ygz8vF4M7frvjz7Rrkq6Gi2MYArxy/u+w2DjR8i/pao1ogua j9dm6bVZt0Pj1jxzTPOZCmbxHate+sWaYL7olP4Lk75S7dyGGoCR1MeJ4N5V2jQf2ls5o5 biEeryMNyPMqW1yAnAZQv8Pgoyfeb7Ti+5JKDyfziYcyoLdT3N+RBxVVv35XXjUG7BldPT 6yTA3MJTtvMZyTwgxLu/Vm4YeTsOFHzFG/4M9O+zceRF5ye+erFSWpFnpjcUPCu0MP35rj vT7UYUZwfVhVJdSzna5UNSH88CbKAgAGrwKsYpelghjLovWQy+z/jsqu2GUV+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701892885; a=rsa-sha256; cv=none; b=R1h2s/+PvhguID95RzSKSwXIoGz3Hv0q4+God8yIwZrpHlYTSqaMRhBCHkNqv8BJd4pvG+ +Wwr+a404gYcwNhd2rCZEOFsvDPyfj6zZWCiYk8EM2KY9KkVUgFqGqFnv0/RY2W9NQm+TC wfZ2MuG/Sup4Lys2jC8Nfsd75LdytXIeCwf0I4YTMLeRuE9UaemHwVxcG18raRrUT6I1Dt K6t/4GfQSDXTsIsyyVRayE43DICYl74u0iLrMaUYYKNCVU4LG3NkRp1HwCneYSruButYtk x7eSjS29RzaIC9j21rRegGgY+I+Nrac3De83mLRuuStDb8MabjVisZ/sVOU7cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701892885; 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=He/94OuuqRbhfGRkygt2MIoT6vvZD842ZQDzuVuGZ20=; b=F3ulg8jtSr9ixuMRJ0HZJGWji4rReeSb5z2cFXYhPXVzBy8d9aU21SXRxeQ2NPiN54ATQe TJc5DjVvPPN1aNlz8b59kSz2+yd/BvszIt6SqorY9jtw9BSXCf1M3qe5ihMbaQT8DFMYts 9vABdsrbOWBbjTQZlBCTqOV8T6kq0X5M5DySv6o8oCmE/nUKZP1amLf9SU1GEpLttCy5+W ZsGknxHdL4lke+72pRGGJAjF5yP5RHjye1q6xFEfv34OFYYQ/YZ4PpM0YdEsPe8ran1CTg zGwwUAPlinJs5+uaUQ89Dp3DePwb5IluiPGfpthHDqO2+fUQyQRFQm+zT6W7PA== 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 4SlpFK4mcnz16Db; Wed, 6 Dec 2023 20:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6K1P13086289; Wed, 6 Dec 2023 20:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6K1PKp086286; Wed, 6 Dec 2023 20:01:25 GMT (envelope-from git) Date: Wed, 6 Dec 2023 20:01:25 GMT Message-Id: <202312062001.3B6K1PKp086286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 6f048e713043 - main - vmstat: Improve -z formatting for large names/values 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f048e71304310db80a210d07cb3768de18589c8 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=6f048e71304310db80a210d07cb3768de18589c8 commit 6f048e71304310db80a210d07cb3768de18589c8 Author: Alexander Motin AuthorDate: 2023-12-06 19:55:58 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 20:00:19 +0000 vmstat: Improve -z formatting for large names/values MFC after: 2 weeks --- usr.bin/vmstat/vmstat.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 6476df06fe39..6d5f000f46a3 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1455,8 +1455,7 @@ domemstat_zone(void) { struct memory_type_list *mtlp; struct memory_type *mtp; - int error; - char name[MEMTYPE_MAXNAME + 1]; + int error, len; mtlp = memstat_mtl_alloc(); if (mtlp == NULL) { @@ -1481,20 +1480,20 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " - "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", - "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); + xo_emit("{T:/%-19s} {T:/%7s} {T:/%7s} {T:/%8s} {T:/%8s} {T:/%8s} " + "{T:/%4s} {T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", + "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOM"); xo_open_list("zone"); for (mtp = memstat_mtl_first(mtlp); mtp != NULL; mtp = memstat_mtl_next(mtp)) { - strlcpy(name, memstat_get_name(mtp), MEMTYPE_MAXNAME); - strcat(name, ":"); + len = strlen(memstat_get_name(mtp)); xo_open_instance("zone"); - xo_emit("{d:name/%-20s}{ke:name/%s} {:size/%6ju}, " - "{:limit/%6ju},{:used/%8ju}," + xo_emit("{k:name/%s}:{d:size/%*ju}{e:size/%ju}," + "{:limit/%7ju},{:used/%8ju}," "{:free/%8ju},{:requests/%8ju}," - "{:fail/%4ju},{:sleep/%4ju},{:xdomain/%4ju}\n", name, - memstat_get_name(mtp), + "{:fail/%4ju},{:sleep/%4ju},{:xdomain/%4ju}\n", + memstat_get_name(mtp), MAX(1, 26 - len), + (uintmax_t)memstat_get_size(mtp), (uintmax_t)memstat_get_size(mtp), (uintmax_t)memstat_get_countlimit(mtp), (uintmax_t)memstat_get_count(mtp),