From nobody Thu Dec 7 04:12:40 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 4Sm1885Jtdz53X6r; Thu, 7 Dec 2023 04:12:40 +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 4Sm1884LgDz3KLj; Thu, 7 Dec 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701922360; 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=CTNZaeVbMBcfczIfXCRVTOkDsAslkS0m+7XAI5S1juc=; b=hnChhpRYB37tiOgsXE1YrhSIOdpXb8HuIY9bLz/OAa9mDXhxMdk36Ir6HTIzQOgQSejPop +4KBAnQfpXr+vD8Z9znfchJwJy29ZZLpksQA3kglYJXYA8gvOEgvzovAwvzJViXogW8/XB 0Ify+eILXRwO0vicvrRx8QtW2En/6mAc6gBi+5Ps/Dir9HcpmjsVFNnmBhKZ/ZLb7Zzd4R xC/ShV7VnrmNRAcF1dE+WpFMUHuuBSOVOS+leyK6FDbgNK5S8bnKlf1ZxvmOTDLI55pRQf QOp6jke3d16W+m8n+CCm9AH6B4jmOM1p3cUSyjwI/epHiyx4BbH0FwI3Gx05EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701922360; a=rsa-sha256; cv=none; b=XBQeGQ1ykHyGds2P7ytq+ENoPAhBBBvPPQPC8z194qeKfbCQJ3f/8mhE+sz1PKO/8pftZj eenJsnLr42JXE7n6ohNPFsuBfhHhDoz5KeSo0oc3Ts6Oyyzm5wW5vkgB0hPHS+FN178CM4 ifcAA6xLrr1lRqzHvvADwtzqp+yGEaUGAWNdaoGNE++w7r0I1QmqmvubOtGk7XmPYa7WCx nDyk6Qotn2X81wVTRMWbifFTPqFTdL1ZY3qZEg4egJODHwNfaZncmRNzIzVBdMs+VPkxQ6 Y3DCaMCLcFBqtfKUHYt4bldqP91EJQ9/kl8W3pHBQlyYwtXQVOxqj8EtWPxePw== 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=1701922360; 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=CTNZaeVbMBcfczIfXCRVTOkDsAslkS0m+7XAI5S1juc=; b=pVz7kt31PTlU63HVynDEyYoyAlzE3Jsavimu2r1wetmQ1dlM0O23jTEbLTSuzHGI7aMC19 cfH6JzmolRLFb15yaNr/eIgicgwyvFPBknfN3x+0upCXxkrR2Zn4sdptA4rV7Hn3ig4y1r 18Efzs1WZ7EGqXkh+2WC82waOOnxq0PWjCwp1uAX92TGWfChYxP/nZ8K47P5vKJO4JqGVZ kYvcfie+OpktlpRXRr0trOSpB7i0iPC/k7uSqSY7Ohlo6ON8obiNPgWbF30XuN4VbjaiGA eAZoVk6q/LKP3iqoEI8UGDSvKud6mOZd4IYK1swrGo8ap1rHBcqSHclnFi0yKA== 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 4Sm1883QCMz6df; Thu, 7 Dec 2023 04:12:40 +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 3B74CeOe011511; Thu, 7 Dec 2023 04:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B74CeXw011508; Thu, 7 Dec 2023 04:12:40 GMT (envelope-from git) Date: Thu, 7 Dec 2023 04:12:40 GMT Message-Id: <202312070412.3B74CeXw011508@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: 598d1ac85e87 - main - vmstat: Let libxo properly humanize -m numbers 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: 598d1ac85e87d9312b9fd3266908ab6a6768edc6 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=598d1ac85e87d9312b9fd3266908ab6a6768edc6 commit 598d1ac85e87d9312b9fd3266908ab6a6768edc6 Author: Alexander Motin AuthorDate: 2023-12-07 04:08:45 +0000 Commit: Alexander Motin CommitDate: 2023-12-07 04:12:30 +0000 vmstat: Let libxo properly humanize -m numbers Raw numbers can be seen in json/xml or with --libxo=no-humanize. MFC after: 2 weeks --- usr.bin/vmstat/vmstat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 6d5f000f46a3..2aa58d77a1f0 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1416,8 +1416,8 @@ domemstat_malloc(void) } } xo_open_container("malloc-statistics"); - xo_emit("{T:/%13s} {T:/%5s} {T:/%6s} {T:/%8s} {T:Size(s)}\n", - "Type", "InUse", "MemUse", "Requests"); + xo_emit("{T:/%16s} {T:/%4s} {T:/%5s} {T:/%3s} {T:Size(s)}\n", + "Type", "Use", "Memory", "Req"); xo_open_list("memory"); zones = memstat_malloc_zone_get_count(); for (mtp = memstat_mtl_first(mtlp); mtp != NULL; @@ -1426,10 +1426,12 @@ domemstat_malloc(void) memstat_get_count(mtp) == 0) continue; xo_open_instance("memory"); - xo_emit("{k:type/%13s/%s} {:in-use/%5ju} " - "{:memory-use/%5ju}{U:K} {:requests/%8ju} ", + xo_emit("{k:type/%16s/%s} " + "{[:4}{h,hn-decimal,hn-1000:in-use/%ju}{]:} " + "{[:5}{h,hn-decimal:memory-use/%ju}{]:} " + "{[:4}{h,hn-decimal,hn-1000:requests/%ju}{]:} ", memstat_get_name(mtp), (uintmax_t)memstat_get_count(mtp), - ((uintmax_t)memstat_get_bytes(mtp) + 1023) / 1024, + (uintmax_t)memstat_get_bytes(mtp), (uintmax_t)memstat_get_numallocs(mtp)); first = 1; xo_open_list("size"); @@ -1437,7 +1439,7 @@ domemstat_malloc(void) if (memstat_malloc_zone_used(mtp, i)) { if (!first) xo_emit(","); - xo_emit("{l:size/%d}", memstat_malloc_zone_get_size(i)); + xo_emit("{lh:size/%d}", memstat_malloc_zone_get_size(i)); first = 0; } }