From owner-svn-src-head@freebsd.org Mon Jan 13 06:55:39 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 328941F9349; Mon, 13 Jan 2020 06:55:39 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47x49Q72BNz45fK; Mon, 13 Jan 2020 06:55:38 +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 D2B9793B; Mon, 13 Jan 2020 06:55:38 +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 00D6tcw2091329; Mon, 13 Jan 2020 06:55:38 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00D6tcn9091328; Mon, 13 Jan 2020 06:55:38 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202001130655.00D6tcn9091328@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 13 Jan 2020 06:55:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356678 - 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: 356678 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2020 06:55:39 -0000 Author: cy Date: Mon Jan 13 06:55:38 2020 New Revision: 356678 URL: https://svnweb.freebsd.org/changeset/base/356678 Log: Sync with r356645. desiredvnodes is now maxvnodes. Modified: head/usr.bin/systat/vmstat.c Modified: head/usr.bin/systat/vmstat.c ============================================================================== --- head/usr.bin/systat/vmstat.c Mon Jan 13 06:55:35 2020 (r356677) +++ head/usr.bin/systat/vmstat.c Mon Jan 13 06:55:38 2020 (r356678) @@ -116,7 +116,7 @@ static struct Info { long nchcount; long *intrcnt; long bufspace; - u_long desiredvnodes; + u_long maxvnodes; long numvnodes; long freevnodes; int numdirtybuffers; @@ -349,7 +349,7 @@ labelkre(void) "| | | | | | | | | | |"); mvprintw(VNSTATROW, VNSTATCOL + 8, "dtbuf"); - mvprintw(VNSTATROW + 1, VNSTATCOL + 8, "desvn"); + mvprintw(VNSTATROW + 1, VNSTATCOL + 8, "maxvn"); mvprintw(VNSTATROW + 2, VNSTATCOL + 8, "numvn"); mvprintw(VNSTATROW + 3, VNSTATCOL + 8, "frevn"); @@ -520,7 +520,7 @@ showkre(void) break; } putint(s.numdirtybuffers, VNSTATROW, VNSTATCOL, 7); - putint(s.desiredvnodes, VNSTATROW + 1, VNSTATCOL, 7); + putint(s.maxvnodes, VNSTATROW + 1, VNSTATCOL, 7); putint(s.numvnodes, VNSTATROW + 2, VNSTATCOL, 7); putint(s.freevnodes, VNSTATROW + 3, VNSTATCOL, 7); putint(s.nchcount, NAMEIROW + 2, NAMEICOL, 8); @@ -780,7 +780,7 @@ getinfo(struct Info *ls) GETSYSCTL("vm.stats.vm.v_inactive_count", ls->v_inactive_count); GETSYSCTL("vm.stats.vm.v_laundry_count", ls->v_laundry_count); GETSYSCTL("vfs.bufspace", ls->bufspace); - GETSYSCTL("kern.maxvnodes", ls->desiredvnodes); + GETSYSCTL("kern.maxvnodes", ls->maxvnodes); GETSYSCTL("vfs.numvnodes", ls->numvnodes); GETSYSCTL("vfs.freevnodes", ls->freevnodes); GETSYSCTL("vfs.cache.nchstats", ls->nchstats);