From nobody Sat Dec 23 04:33:54 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 4SxrsH16MJz54xGF; Sat, 23 Dec 2023 04:33:55 +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 4SxrsG4SnJz3Swt; Sat, 23 Dec 2023 04:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703306034; 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=HmtLWENQP3l2zNkdJhoT9ElXLD4JA2SlqwvcKBogRQg=; b=m4xJwnC8mwZVAEdSfNUT27/DpBjomJ7GAJRcU/4OYbLNEqKSP1HpivXWk4j+0V7oFD9H5Q ECUzZC1eF+cR0F3bjz0EphMRLMqYIgs0tWxB1RSrCSQZjk6jp03KkoqHUl+x8DQGDNsCaT kyo7qYz+jg0zOKIrEml/dxCrkyLey+YRJT4b1TiVm+mgOO2ZfrudjUgaC8ZMzLoamHn4Xv rpp5JLbPIOxXXpJQNejqDuVeA/xeKke1tz43q+ie+It1ucN90QH83/pcYvxKtEwT8/E/2F uHbAJb1iR7zyAqQfBT0JOES0xym4TQThoP1xaByb2smqXg0LqLFlx76nxRl28w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703306034; a=rsa-sha256; cv=none; b=JtrUdbjd3MfkI89AcUHVrRMeuash/2ZgUxpeekxgZ2C1AtcvlNO6fo4D+rnF3hzPYMDTFF Zw+hWqNf4wQGNtK237/Jyp73RJqEczDVRIXLvnGLFjA7Y0/nANmkG44UclcV+F/7vMArQC wcB6re+Ldz9S86lmJl/qa268vCFA0GkdFU5jhDsPTsPd/qJixKdeaSgU3cvkFwHeZR9d7c wLpEzCIOB6vSbS8C4VmL0dUUxb0nX27IdocupqkEcm6fdsABb2TWSJozIK11PCrfRNJalq +Mi6r8qx9+FmfFU/ifNsl4YBt2Fc+puhka03k1QLud37criHwYIsPiHD3LT4gg== 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=1703306034; 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=HmtLWENQP3l2zNkdJhoT9ElXLD4JA2SlqwvcKBogRQg=; b=FdTrFjZ7oLR4C6iY+wkwZ17S0noUN5LMGNv72gKGfSdIaH1jJkFNdQsyZxyRWrbw/BJ2Hz wmzKSDBb3lKWPcIGDFPpDjJ5ZpLtUYFuvztMIGot6KzEtPXPIFJYXCgcejQz9b8XOrgy+z y6jXDoFmK1Mhjz89TE1TQJjYgLVcvSjZVSFHoLIGm+Y7HhSYTzpfxJNl+rI3uiPycVInb0 Wd6DvGvQXqTGaqupQAzPXbdSgcGEaykWeZle+gzySD/Xlc2JOf5BhWB4dEXWI8J6bHIXtY mTFce9EXjgGngVw4q+A59BRpPnO9dOc3ge+GKbKm68NydoIDTqOTMxYD1EIfWw== 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 4SxrsG3Z2fzlpM; Sat, 23 Dec 2023 04:33:54 +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 3BN4XsDm087814; Sat, 23 Dec 2023 04:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BN4XsTn087811; Sat, 23 Dec 2023 04:33:54 GMT (envelope-from git) Date: Sat, 23 Dec 2023 04:33:54 GMT Message-Id: <202312230433.3BN4XsTn087811@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: bf5635d594cb - stable/14 - vmstat: Let libxo properly humanize -m numbers 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: bf5635d594cb59d4ffe147600cfcc48ffec44916 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=bf5635d594cb59d4ffe147600cfcc48ffec44916 commit bf5635d594cb59d4ffe147600cfcc48ffec44916 Author: Alexander Motin AuthorDate: 2023-12-07 04:08:45 +0000 Commit: Alexander Motin CommitDate: 2023-12-23 04:13:24 +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 (cherry picked from commit 598d1ac85e87d9312b9fd3266908ab6a6768edc6) --- 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 a72ba127f40c..6ef718864886 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1429,8 +1429,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; @@ -1439,10 +1439,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"); @@ -1450,7 +1452,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; } }