From owner-svn-src-all@freebsd.org Thu Apr 20 22:30:40 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E04BD484D8; Thu, 20 Apr 2017 22:30:40 +0000 (UTC) (envelope-from jkim@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 mx1.freebsd.org (Postfix) with ESMTPS id 5FA26D76; Thu, 20 Apr 2017 22:30:40 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3KMUds4030763; Thu, 20 Apr 2017 22:30:39 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KMUdAm030762; Thu, 20 Apr 2017 22:30:39 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201704202230.v3KMUdAm030762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 20 Apr 2017 22:30:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317231 - head/usr.bin/systat X-SVN-Group: head 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.23 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: Thu, 20 Apr 2017 22:30:40 -0000 Author: jkim Date: Thu Apr 20 22:30:39 2017 New Revision: 317231 URL: https://svnweb.freebsd.org/changeset/base/317231 Log: Fix systat(1) regression. It was broken by r317061. Modified: head/usr.bin/systat/vmstat.c Modified: head/usr.bin/systat/vmstat.c ============================================================================== --- head/usr.bin/systat/vmstat.c Thu Apr 20 21:48:54 2017 (r317230) +++ head/usr.bin/systat/vmstat.c Thu Apr 20 22:30:39 2017 (r317231) @@ -70,35 +70,35 @@ static const char sccsid[] = "@(#)vmstat static struct Info { long time[CPUSTATES]; - u_int v_swtch; /* context switches */ - u_int v_trap; /* calls to trap */ - u_int v_syscall; /* calls to syscall() */ - u_int v_intr; /* device interrupts */ - u_int v_soft; /* software interrupts */ + uint64_t v_swtch; /* context switches */ + uint64_t v_trap; /* calls to trap */ + uint64_t v_syscall; /* calls to syscall() */ + uint64_t v_intr; /* device interrupts */ + uint64_t v_soft; /* software interrupts */ /* * Virtual memory activity. */ - u_int v_vm_faults; /* number of address memory faults */ - u_int v_io_faults; /* page faults requiring I/O */ - u_int v_cow_faults; /* number of copy-on-writes */ - u_int v_zfod; /* pages zero filled on demand */ - u_int v_ozfod; /* optimized zero fill pages */ - u_int v_swapin; /* swap pager pageins */ - u_int v_swapout; /* swap pager pageouts */ - u_int v_swappgsin; /* swap pager pages paged in */ - u_int v_swappgsout; /* swap pager pages paged out */ - u_int v_vnodein; /* vnode pager pageins */ - u_int v_vnodeout; /* vnode pager pageouts */ - u_int v_vnodepgsin; /* vnode_pager pages paged in */ - u_int v_vnodepgsout; /* vnode pager pages paged out */ - u_int v_intrans; /* intransit blocking page faults */ - u_int v_reactivated; /* number of pages reactivated by pagedaemon */ - u_int v_pdwakeups; /* number of times daemon has awaken from sleep */ - u_int v_pdpages; /* number of pages analyzed by daemon */ - - u_int v_dfree; /* pages freed by daemon */ - u_int v_pfree; /* pages freed by exiting processes */ - u_int v_tfree; /* total pages freed */ + uint64_t v_vm_faults; /* number of address memory faults */ + uint64_t v_io_faults; /* page faults requiring I/O */ + uint64_t v_cow_faults; /* number of copy-on-writes */ + uint64_t v_zfod; /* pages zero filled on demand */ + uint64_t v_ozfod; /* optimized zero fill pages */ + uint64_t v_swapin; /* swap pager pageins */ + uint64_t v_swapout; /* swap pager pageouts */ + uint64_t v_swappgsin; /* swap pager pages paged in */ + uint64_t v_swappgsout; /* swap pager pages paged out */ + uint64_t v_vnodein; /* vnode pager pageins */ + uint64_t v_vnodeout; /* vnode pager pageouts */ + uint64_t v_vnodepgsin; /* vnode_pager pages paged in */ + uint64_t v_vnodepgsout; /* vnode pager pages paged out */ + uint64_t v_intrans; /* intransit blocking page faults */ + uint64_t v_reactivated; /* number of pages reactivated by pagedaemon */ + uint64_t v_pdwakeups; /* number of times daemon has awaken from sleep */ + uint64_t v_pdpages; /* number of pages analyzed by daemon */ + + uint64_t v_dfree; /* pages freed by daemon */ + uint64_t v_pfree; /* pages freed by exiting processes */ + uint64_t v_tfree; /* total pages freed */ /* * Distribution of page usages. */