From owner-svn-src-head@FreeBSD.ORG Wed Dec 14 16:59:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E9C1065675; Wed, 14 Dec 2011 16:59:59 +0000 (UTC) (envelope-from fidaj@ukr.net) Received: from fsm1.ukr.net (fsm1.ukr.net [195.214.192.120]) by mx1.freebsd.org (Postfix) with ESMTP id 3C7F38FC1D; Wed, 14 Dec 2011 16:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=X4gPo746gZw+x27b9dh6wYAR+ChXxbt2+msJViBS7hI=; b=SEet77kK7f7l3JSMnUbw9nGm+HmSz+37ACY1+MLMI4+/My4cSM3m2Kapt6B1F7CRGWVHaWXyiw0PxjrBVBuMoOV7l8wHrNIedYtGMhAItg/KEv5zkAWiFVzYhDHr2lRp6ZNRx+uHjI3M8XLJENpcyQcLUoVMkKPZtisaGrB0W2U=; Received: from [178.137.138.140] (helo=nonamehost.) by fsm1.ukr.net with esmtpsa ID 1RasBQ-00080k-SQ ; Wed, 14 Dec 2011 18:59:57 +0200 Date: Wed, 14 Dec 2011 18:59:56 +0200 From: Ivan Klymenko To: Eitan Adler Message-ID: <20111214185956.3837f456@nonamehost.> In-Reply-To: <201112141325.pBEDP0OX000330@svn.freebsd.org> References: <201112141325.pBEDP0OX000330@svn.freebsd.org> X-Mailer: Claws Mail 3.7.10 (GTK+ 2.24.6; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r228498 - head/sys/vm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 14 Dec 2011 16:59:59 -0000 =D0=92 Wed, 14 Dec 2011 13:25:00 +0000 (UTC) Eitan Adler =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > Author: eadler (ports committer) > Date: Wed Dec 14 13:25:00 2011 > New Revision: 228498 > URL: http://svn.freebsd.org/changeset/base/228498 >=20 > Log: > - The previous commit (r228449) accidentally moved the > vm.stats.vm.* sysctls to vm.stats.sys. Move them back. > =20 > Noticed by: pho > Reviewed by: bde (earlier version) > Approved by: bz > MFC after: 1 week > Pointy hat to: me >=20 > Modified: > head/sys/vm/vm_meter.c >=20 > Modified: head/sys/vm/vm_meter.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/vm/vm_meter.c Wed Dec 14 13:12:55 2011 > (r228497) +++ head/sys/vm/vm_meter.c Wed Dec 14 13:25:00 > 2011 (r228498) @@ -270,59 +270,62 @@ static > SYSCTL_NODE(_vm_stats, OID_AUTO, "VM meter vm stats"); > SYSCTL_NODE(_vm_stats, OID_AUTO, misc, CTLFLAG_RW, 0, "VM meter misc > stats");=20 > -#define VM_STATS_SYS(var, descr) SYSCTL_PROC(_vm_stats_sys, > OID_AUTO, var, \ > - (CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_MPSAFE), &cnt.v_swtch, 0, > vcnt, \ > - "IU", descr); > +#define VM_STATS(parent, var, descr) \ > + SYSCTL_PROC(parent, OID_AUTO, var, \ > + CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_MPSAFE, &cnt.var, 0, > vcnt, \ > + "IU", descr) > +#define VM_STATS_VM(var, descr) > VM_STATS(_vm_stats_vm, var, descr) +#define VM_STATS_SYS(var, > descr) VM_STATS(_vm_stats_sys, var, descr)=20 > VM_STATS_SYS(v_swtch, "Context switches"); > VM_STATS_SYS(v_trap, "Traps"); > VM_STATS_SYS(v_syscall, "System calls"); > VM_STATS_SYS(v_intr, "Device interrupts"); > VM_STATS_SYS(v_soft, "Software interrupts"); > -VM_STATS_SYS(v_vm_faults, "Address memory faults"); > -VM_STATS_SYS(v_cow_faults, "Copy-on-write faults"); > -VM_STATS_SYS(v_cow_optim, "Optimized COW faults") > -VM_STATS_SYS(v_zfod, "Pages zero-filled on demand") > -VM_STATS_SYS(v_ozfod, "Optimized zero fill pages") > -VM_STATS_SYS(v_swapin, "Swap pager pageins") > -VM_STATS_SYS(v_swapout, "Swap pager pageouts") > -VM_STATS_SYS(v_swappgsin, "Swap pages swapped in") > -VM_STATS_SYS(v_swappgsout, "Swap pages swapped out") > -VM_STATS_SYS(v_vnodein, "Vnode pager pageins") > -VM_STATS_SYS(v_vnodeout, "Vnode pager pageouts") > -VM_STATS_SYS(v_vnodepgsin, "Vnode pages paged in") > -VM_STATS_SYS(v_vnodepgsout, "Vnode pages paged out") > -VM_STATS_SYS(v_intrans, "In transit page faults") > -VM_STATS_SYS(v_reactivated, "Pages reactivated from free list") > -VM_STATS_SYS(v_pdwakeups, "Pagedaemon wakeups") > -VM_STATS_SYS(v_pdpages, "Pages analyzed by pagedaemon") > -VM_STATS_SYS(v_tcached, "Total pages cached") > -VM_STATS_SYS(v_dfree, "Pages freed by pagedaemon") > -VM_STATS_SYS(v_pfree, "Pages freed by exiting processes") > -VM_STATS_SYS(v_tfree, "Total pages freed") > -VM_STATS_SYS(v_page_size, "Page size in bytes") > -VM_STATS_SYS(v_page_count, "Total number of pages in system") > -VM_STATS_SYS(v_free_reserved, "Pages reserved for deadlock") > -VM_STATS_SYS(v_free_target, "Pages desired free") > -VM_STATS_SYS(v_free_min, "Minimum low-free-pages threshold") > -VM_STATS_SYS(v_free_count, "Free pages") > -VM_STATS_SYS(v_wire_count, "Wired pages") > -VM_STATS_SYS(v_active_count, "Active pages") > -VM_STATS_SYS(v_inactive_target, "Desired inactive pages") > -VM_STATS_SYS(v_inactive_count, "Inactive pages") > -VM_STATS_SYS(v_cache_count, "Pages on cache queue") > -VM_STATS_SYS(v_cache_min, "Min pages on cache queue") > -VM_STATS_SYS(v_cache_max, "Max pages on cached queue") > -VM_STATS_SYS(v_pageout_free_min, "Min pages reserved for kernel") > -VM_STATS_SYS(v_interrupt_free_min, "Reserved pages for interrupt > code") -VM_STATS_SYS(v_forks, "Number of fork() calls") > -VM_STATS_SYS(v_vforks, "Number of vfork() calls") > -VM_STATS_SYS(v_rforks, "Number of rfork() calls") > -VM_STATS_SYS(v_kthreads, "Number of fork() calls by kernel") > -VM_STATS_SYS(v_forkpages, "VM pages affected by fork()") > -VM_STATS_SYS(v_vforkpages, "VM pages affected by vfork()") > -VM_STATS_SYS(v_rforkpages, "VM pages affected by rfork()") > -VM_STATS_SYS(v_kthreadpages, "VM pages affected by fork() by kernel") > +VM_STATS_VM(v_vm_faults, "Address memory faults"); > +VM_STATS_VM(v_cow_faults, "Copy-on-write faults"); > +VM_STATS_VM(v_cow_optim, "Optimized COW faults"); > +VM_STATS_VM(v_zfod, "Pages zero-filled on demand"); > +VM_STATS_VM(v_ozfod, "Optimized zero fill pages"); > +VM_STATS_VM(v_swapin, "Swap pager pageins"); > +VM_STATS_VM(v_swapout, "Swap pager pageouts"); > +VM_STATS_VM(v_swappgsin, "Swap pages swapped in"); > +VM_STATS_VM(v_swappgsout, "Swap pages swapped out"); > +VM_STATS_VM(v_vnodein, "Vnode pager pageins"); > +VM_STATS_VM(v_vnodeout, "Vnode pager pageouts"); > +VM_STATS_VM(v_vnodepgsin, "Vnode pages paged in"); > +VM_STATS_VM(v_vnodepgsout, "Vnode pages paged out"); > +VM_STATS_VM(v_intrans, "In transit page faults"); > +VM_STATS_VM(v_reactivated, "Pages reactivated from free list"); > +VM_STATS_VM(v_pdwakeups, "Pagedaemon wakeups"); > +VM_STATS_VM(v_pdpages, "Pages analyzed by pagedaemon"); > +VM_STATS_VM(v_tcached, "Total pages cached"); > +VM_STATS_VM(v_dfree, "Pages freed by pagedaemon"); > +VM_STATS_VM(v_pfree, "Pages freed by exiting processes"); > +VM_STATS_VM(v_tfree, "Total pages freed"); > +VM_STATS_VM(v_page_size, "Page size in bytes"); > +VM_STATS_VM(v_page_count, "Total number of pages in system"); > +VM_STATS_VM(v_free_reserved, "Pages reserved for deadlock"); > +VM_STATS_VM(v_free_target, "Pages desired free"); > +VM_STATS_VM(v_free_min, "Minimum low-free-pages threshold"); > +VM_STATS_VM(v_free_count, "Free pages"); > +VM_STATS_VM(v_wire_count, "Wired pages"); > +VM_STATS_VM(v_active_count, "Active pages"); > +VM_STATS_VM(v_inactive_target, "Desired inactive pages"); > +VM_STATS_VM(v_inactive_count, "Inactive pages"); > +VM_STATS_VM(v_cache_count, "Pages on cache queue"); > +VM_STATS_VM(v_cache_min, "Min pages on cache queue"); > +VM_STATS_VM(v_cache_max, "Max pages on cached queue"); > +VM_STATS_VM(v_pageout_free_min, "Min pages reserved for kernel"); > +VM_STATS_VM(v_interrupt_free_min, "Reserved pages for interrupt > code"); +VM_STATS_VM(v_forks, "Number of fork() calls"); > +VM_STATS_VM(v_vforks, "Number of vfork() calls"); > +VM_STATS_VM(v_rforks, "Number of rfork() calls"); > +VM_STATS_VM(v_kthreads, "Number of fork() calls by kernel"); > +VM_STATS_VM(v_forkpages, "VM pages affected by fork()"); > +VM_STATS_VM(v_vforkpages, "VM pages affected by vfork()"); > +VM_STATS_VM(v_rforkpages, "VM pages affected by rfork()"); > +VM_STATS_VM(v_kthreadpages, "VM pages affected by fork() by kernel"); > =20 > SYSCTL_INT(_vm_stats_misc, OID_AUTO, zero_page_count, CTLFLAG_RD, > &vm_page_zero_count, 0, "Number of zero-ed free pages"); Thank you! It works!