From nobody Thu Jan 11 15:01:54 2024 X-Original-To: dev-commits-src-main@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 4T9nv71n7bz56CLn; Thu, 11 Jan 2024 15:01: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 4T9nv71CyBz4fwV; Thu, 11 Jan 2024 15:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704985315; 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=TUV8S1lB4x9JOuLcni7psdb2pGMJamlRXs7yMGMhdZE=; b=yjp5LKcDcrkpbRRMwW7R8mKzpGkdIzLYnP2KAbVGGVo1CU3gb5EjkdRHINhLLjP9/FYb95 jHAjPfSgTctpobQzjZdfT4XtQuKvmTw78EVwHLxuABGJX/9iNa95cg9nDO7LaffufAvGLA zLXwX7ee8mC+l6FMny5ncygV0DSPgO4CMDof/u5+wdCLHrYEjJfmCsvn9nMI6rp/TnukzL Ea622GcFAwLnH0xkzP3j3kpkPIwJ+5e2R1qwHJa57dFMacrseZENtAdbAk3LHB4R1u8yiU 01PyAU916Kr3M4JeHv/tt3ns00RrPtcWMrIBemeJ26tqJ+ffgjFoFFogJ8JrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704985315; 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=TUV8S1lB4x9JOuLcni7psdb2pGMJamlRXs7yMGMhdZE=; b=xc+oVmnEKDR96MUYZvPzG9bA7TDhITwJnH4z70g2msMlqbTWP8J+pdT3xf1N3tNkS2EsKK DmrlOL6UTUnlrljY6FHqle8mA0hutZk3sZkNP1domRG0eab2L4/7o/ObLd+w/bTJKEdKy/ sZXvbZ4CIO7pkGnfRU3wh0WZrRFv0tb8pMdPoV7ZCGSZMM886kEXaZWF1t6yHOdnG2gh7s nuuTa1uqBM2egiGI5phUso4KW1CZblBsvJM0QuKN8MrxvJJdvWP5bCtTGz/c0exqr+LK23 mK3N2joRvP9E4B7tasDguTyDS9O13UhlY1hVN+ycsZEvJP63+MAQwPOkddUE5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704985315; a=rsa-sha256; cv=none; b=d3ah3M3wy2lDdAZPvl16yGZLGUo5yrXhgx5pMR79tZZ/7gtq9KQlNsYUds5us4GJ7f+K6s SQ1haRxZ7wW3aZy5cAm8G+JPrTfMmhsd0oWQGzv7zGVLlgAOV9wAxVNIDXZgIiGSCSFvPH E0J9UpwxiVu56yI/cV6Mw2cqP1XScJN5YI0u2qikqKceCu7kejkV+pRBfePT442s22KWfP q5AzGz0Qg+lg345D0uS/odXCfqkLCLYGU15q0qdaB8YrV6DnrfNb2MIs+qtI2cEmh5TYlw xNAINQU+aq2iw6Yzc6JlYjyF+0vqkRUIIhlDuejA8hiFKbuhZSnjUWIRfTESTg== 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 4T9nv70G65zNrJ; Thu, 11 Jan 2024 15:01:55 +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 40BF1sHI074361; Thu, 11 Jan 2024 15:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BF1sFk074358; Thu, 11 Jan 2024 15:01:54 GMT (envelope-from git) Date: Thu, 11 Jan 2024 15:01:54 GMT Message-Id: <202401111501.40BF1sFk074358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1f62718d8ba2 - main - top: Avoid printing a blank line when the ZFS ARC is empty List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f62718d8ba26d813d8c2e826ac5f4caee4c6730 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f62718d8ba26d813d8c2e826ac5f4caee4c6730 commit 1f62718d8ba26d813d8c2e826ac5f4caee4c6730 Author: Mark Johnston AuthorDate: 2024-01-11 14:58:31 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 15:01:37 +0000 top: Avoid printing a blank line when the ZFS ARC is empty PR: 275994 MFC after: 2 weeks --- usr.bin/top/machine.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b4cd29dab878..a76d77a80ce4 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -293,17 +293,27 @@ machine_init(struct statics *statics) size = sizeof(carc_en); if (arc_enabled && sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size, - NULL, 0) == 0 && carc_en == 1) - carc_enabled = 1; + NULL, 0) == 0 && carc_en == 1) { + uint64_t uncomp_sz; + + /* + * Don't report compression stats if no data is in the ARC. + * Otherwise, we end up printing a blank line. + */ + size = sizeof(uncomp_sz); + if (sysctlbyname("kstat.zfs.misc.arcstats.uncompressed_size", + &uncomp_sz, &size, NULL, 0) == 0 && uncomp_sz != 0) + carc_enabled = 1; + } kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open"); if (kd == NULL) return (-1); size = sizeof(nswapdev); - if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, - 0) == 0 && nswapdev != 0) - has_swap = 1; + if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, 0) == 0 && + nswapdev != 0) + has_swap = 1; GETSYSCTL("kern.ccpu", ccpu);