From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 08:22:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0187F1065672; Fri, 31 Oct 2008 08:22:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA168106564A
	for <perforce@freebsd.org>; Fri, 31 Oct 2008 08:22:41 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ACAC68FC18
	for <perforce@freebsd.org>; Fri, 31 Oct 2008 08:22:41 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9V8MfPY002054
	for <perforce@freebsd.org>; Fri, 31 Oct 2008 08:22:41 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9V8MfGR002051
	for perforce@freebsd.org; Fri, 31 Oct 2008 08:22:41 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 31 Oct 2008 08:22:41 GMT
Message-Id: <200810310822.m9V8MfGR002051@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152253 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Oct 2008 08:22:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=152253

Change 152253 by peter@peter_overcee on 2008/10/31 08:21:49

	grab device and inode number from sysctl

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#9 edit
.. //depot/projects/valgrind/include/vki/vki-freebsd.h#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#9 (text+ko) ====

@@ -2955,12 +2955,16 @@
    i = 0;
    kve = (struct vki_kinfo_vmentry *)procmap_buf;
    for (i = 0; i < (len / sizeof(*kve)); i++, kve++) {
-      dev = ino = 0;
-
+      if (kve->kve_structsize != sizeof(*kve)) {
+         VG_(debugLog)(0, "procselfmaps", "sysctl out of sync\n");
+         ML_(am_exit)(1);
+      }
       start      = (UWord)kve->kve_start;
       endPlusOne = (UWord)kve->kve_end;
       foffset    = kve->kve_offset;
       filename   = kve->kve_path;
+      dev        = kve->kve_fsid;
+      ino        = kve->kve_fileid;
       if (filename[0] != '/') {
 	 filename = NULL;
 	 foffset = 0;

==== //depot/projects/valgrind/include/vki/vki-freebsd.h#8 (text+ko) ====

@@ -1772,12 +1772,11 @@
 	int	kve_ref_count;
 	int	kve_shadow_count;
 	char	kve_path[VKI_PATH_MAX];
+	void *	kve_pspare[8];
 	Off64T	kve_offset;
-#ifdef VGA_amd64
-	long	kve_pad;
-#endif
-	void *	kve_pspare[6];
-	int	kve_ispare[8];
+	ULong   kve_fileid;
+	UInt    kve_fsid;
+	int	kve_ispare[3];
 };
 
 //----------------------------------------------------------------------