From owner-svn-src-all@freebsd.org Sun Aug 12 07:47:45 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E6021067A99; Sun, 12 Aug 2018 07:47:45 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D07F57CEB7; Sun, 12 Aug 2018 07:47:44 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A519123273; Sun, 12 Aug 2018 07:47:44 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7C7linu096248; Sun, 12 Aug 2018 07:47:44 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7C7liwS096247; Sun, 12 Aug 2018 07:47:44 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201808120747.w7C7liwS096247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 12 Aug 2018 07:47:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337680 - head/usr.bin/systat X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/usr.bin/systat X-SVN-Commit-Revision: 337680 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2018 07:47:45 -0000 Author: cy Date: Sun Aug 12 07:47:44 2018 New Revision: 337680 URL: https://svnweb.freebsd.org/changeset/base/337680 Log: Chasing r337661, fix systat after arc accounting change. Modified: head/usr.bin/systat/main.c Modified: head/usr.bin/systat/main.c ============================================================================== --- head/usr.bin/systat/main.c Sun Aug 12 03:36:09 2018 (r337679) +++ head/usr.bin/systat/main.c Sun Aug 12 07:47:44 2018 (r337680) @@ -260,6 +260,7 @@ labels(void) void display(void) { + uint64_t arc_stat; int i, j; /* Get the load average over the last minute. */ @@ -293,7 +294,11 @@ display(void) GETSYSCTL("vfs.zfs.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); - GETSYSCTL("kstat.zfs.misc.arcstats.other_size", arc[6]); + GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); + GETSYSCTL("kstat.zfs.misc.arcstats.dnode_size", arc_stat); + arc[6] += arc_stat; + GETSYSCTL("kstat.zfs.misc.arcstats.dbuf_size", arc_stat); + arc[6] += arc_stat; wmove(wload, 0, 0); wclrtoeol(wload); for (i = 0 ; i < nitems(arc); i++) { if (arc[i] > 10llu * 1024 * 1024 * 1024 ) {