From owner-svn-src-head@FreeBSD.ORG  Fri Jun 18 01:17:17 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 8300E1065672;
	Fri, 18 Jun 2010 01:17:17 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 728AF8FC14;
	Fri, 18 Jun 2010 01:17:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5I1HHV2005309;
	Fri, 18 Jun 2010 01:17:17 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5I1HHb5005308;
	Fri, 18 Jun 2010 01:17:17 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201006180117.o5I1HHb5005308@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Fri, 18 Jun 2010 01:17:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209276 - head/lib/libkvm
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jun 2010 01:17:17 -0000

Author: sbruno
Date: Fri Jun 18 01:17:16 2010
New Revision: 209276
URL: http://svn.freebsd.org/changeset/base/209276

Log:
  Much closer approximation of the kernel's calculation of this value.
  
  Reviewed by:	alc
  Obtained from:	Yahoo Inc.

Modified:
  head/lib/libkvm/kvm_proc.c

Modified: head/lib/libkvm/kvm_proc.c
==============================================================================
--- head/lib/libkvm/kvm_proc.c	Thu Jun 17 22:47:44 2010	(r209275)
+++ head/lib/libkvm/kvm_proc.c	Fri Jun 18 01:17:16 2010	(r209276)
@@ -323,7 +323,12 @@ nopgrp:
 		(void)kvm_read(kd, (u_long)proc.p_vmspace,
 		    (char *)&vmspace, sizeof(vmspace));
 		kp->ki_size = vmspace.vm_map.size;
-		kp->ki_rssize = vmspace.vm_swrss; /* XXX */
+		/*
+		 * Approximate the kernel's method of calculating
+		 * this field.
+		 */
+#define		pmap_resident_count(pm) ((pm)->pm_stats.resident_count)
+		kp->ki_rssize = pmap_resident_count(&vmspace.vm_pmap); 
 		kp->ki_swrss = vmspace.vm_swrss;
 		kp->ki_tsize = vmspace.vm_tsize;
 		kp->ki_dsize = vmspace.vm_dsize;