From nobody Sat Dec 23 04:33:53 2023 X-Original-To: dev-commits-src-branches@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 4SxrsF4gN9z54x7k; Sat, 23 Dec 2023 04:33:53 +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 4SxrsF3T4nz3Sg8; Sat, 23 Dec 2023 04:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703306033; 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=evxagdjLyfMP0YqLUbYIQ98RzKlEeCnaJSMh+dgbXIY=; b=kyCiqmWC53zPDfrWwE8IRuHiiTOQpZvAy41I8IbZJ/6y8lgY5UOgjZ3Cb+9zxd6hx3RW1D d/3woyE6mqZWqCLqpMDLZqWxrkAuoqHCkdEva+OWd7OWUNjJdjOa65+8f3x80N6WXrAAIF BkOEw85sw7JaeQ31PLbcx5J+yYXBsTPCZFbD6tkU1LJOSWLcVZ44DYVFTFZHbU/4MLtVcA C35msOAW10NO01tss1GU/2V8HnBVe76NjsJ1O8gY8RGSY5CuUEi2UGQTuRWUDWT4WeZ9XE kytC70Y0Z4WSIdf9l6Hufaz5NYZK0b3qFMBMZnXHSoP+tXsYvoCgGMzXqFKQNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703306033; a=rsa-sha256; cv=none; b=vBL4OnGOSbSqbf2FGO9i1f3Pz/PNwmQTM0kwk0HrS7pANTB8v+hgbWaWxdZhegXo7uJD2B sFDjn9cBXI2ktT8BahroyHBnolkTnIcyZsYY47DDOUQZi6u6ZtmfIsl6qmRYltc0TQd0GV L9A9OWsm7QqABsjTK3dlEfd6l9i4GYRbJW0Rk+rvibljMjXXefmBjuEnili1AGZZqXZfge kpeyH7kOcuJuylx5pam8YsYdrbLMB4ZsRdMZBV/ThiaHonK0WxTj9WXiJywEx9QA14hA+G mE/mp7zghhTuPMUR2QxpiiHMtXUjVqAdE27CSxjsp2O6hmf8mbF2ji5CwyWgwA== 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=1703306033; 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=evxagdjLyfMP0YqLUbYIQ98RzKlEeCnaJSMh+dgbXIY=; b=BkJvI2DvJDG/LY+XfZ2c6R3Otq0KwB8EwRHIHrzLwxvNZUebZbAoqm+bEWHok8VocfVvxk oH8n+0UDPsK8rSoyvdzAjQuYBgQ6B4sDjZbwRqBv9Xt9OdABL6edhZ2/n6ZLmh02aBZ/Y6 Li+MpNyf5ok7UstW3HoC7oC1khMShWxGCnu89YkTxfEuGA7w2BaPp4Uccl2dK4JxZFtjfa 9jJS0SdRvCrvMXfvW99+a6K6V7LnISGWmauf1BaTtlfuLDP9zXeibpTIMbBlBOoiWLhWVS 5QwLrjzH4qOaWSX+8n8pFd5rPP+fzXkqdj9hm+LeXuzcg0kcTK1kK1lpWBzeYw== 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 4SxrsF2XK8zm84; Sat, 23 Dec 2023 04:33:53 +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 3BN4XrJn087766; Sat, 23 Dec 2023 04:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BN4XrkI087763; Sat, 23 Dec 2023 04:33:53 GMT (envelope-from git) Date: Sat, 23 Dec 2023 04:33:53 GMT Message-Id: <202312230433.3BN4XrkI087763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: b0b4dedfa163 - stable/14 - vmstat: Improve -z formatting for large names/values List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b0b4dedfa163623e8ab2c3f76480c7041ade2c2e Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b0b4dedfa163623e8ab2c3f76480c7041ade2c2e commit b0b4dedfa163623e8ab2c3f76480c7041ade2c2e Author: Alexander Motin AuthorDate: 2023-12-06 19:55:58 +0000 Commit: Alexander Motin CommitDate: 2023-12-23 04:13:24 +0000 vmstat: Improve -z formatting for large names/values MFC after: 2 weeks (cherry picked from commit 6f048e71304310db80a210d07cb3768de18589c8) --- 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 c4fb7186363f..a72ba127f40c 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1468,8 +1468,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) { @@ -1494,20 +1493,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),