Module Name: src
Committed By: riz
Date: Tue Jun 12 17:18:23 UTC 2012
Modified Files:
src/lib/libkvm [netbsd-6]: kvm_proc.c
src/sys/kern [netbsd-6]: kern_proc.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #310):
sys/kern/kern_proc.c: revision 1.184
lib/libkvm/kvm_proc.c: revision 1.89
Measure kinfo_proc2::p_vm_vsize in pages, as it was always documented.
This value seems to never have been used anywhere.
This makes it consistent with it's cousin p_vm_msize (which is in pages as
well and has several uses).
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.88.8.1 src/lib/libkvm/kvm_proc.c
cvs rdiff -u -r1.181 -r1.181.2.1 src/sys/kern/kern_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm_proc.c
diff -u src/lib/libkvm/kvm_proc.c:1.88 src/lib/libkvm/kvm_proc.c:1.88.8.1
--- src/lib/libkvm/kvm_proc.c:1.88 Fri Nov 12 04:52:08 2010
+++ src/lib/libkvm/kvm_proc.c Tue Jun 12 17:18:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_proc.c,v 1.88 2010/11/12 04:52:08 uebayasi Exp $ */
+/* $NetBSD: kvm_proc.c,v 1.88.8.1 2012/06/12 17:18:22 riz Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93";
#else
-__RCSID("$NetBSD: kvm_proc.c,v 1.88 2010/11/12 04:52:08 uebayasi Exp $");
+__RCSID("$NetBSD: kvm_proc.c,v 1.88.8.1 2012/06/12 17:18:22 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -657,7 +657,8 @@ again:
kp2p->p_vm_tsize = kp->kp_eproc.e_vm.vm_tsize;
kp2p->p_vm_dsize = kp->kp_eproc.e_vm.vm_dsize;
kp2p->p_vm_ssize = kp->kp_eproc.e_vm.vm_ssize;
- kp2p->p_vm_vsize = kp->kp_eproc.e_vm.vm_map.size;
+ kp2p->p_vm_vsize = kp->kp_eproc.e_vm.vm_map.size
+ / kd->nbpg;
/* Adjust mapped size */
kp2p->p_vm_msize =
(kp->kp_eproc.e_vm.vm_map.size / kd->nbpg) -
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.181 src/sys/kern/kern_proc.c:1.181.2.1
--- src/sys/kern/kern_proc.c:1.181 Sat Feb 11 23:16:17 2012
+++ src/sys/kern/kern_proc.c Tue Jun 12 17:18:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.181 2012/02/11 23:16:17 martin Exp $ */
+/* $NetBSD: kern_proc.c,v 1.181.2.1 2012/06/12 17:18:22 riz Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.181 2012/02/11 23:16:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.181.2.1 2012/06/12 17:18:22 riz Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -2277,7 +2277,7 @@ fill_kproc2(struct proc *p, struct kinfo
ki->p_vm_tsize = vm->vm_tsize;
ki->p_vm_dsize = vm->vm_dsize;
ki->p_vm_ssize = vm->vm_ssize;
- ki->p_vm_vsize = vm->vm_map.size;
+ ki->p_vm_vsize = atop(vm->vm_map.size);
/*
* Since the stack is initially mapped mostly with
* PROT_NONE and grown as needed, adjust the "mapped size"
