PERFORCE change 152253 for review

[Peter Wemm]

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

Change 152253 by peter at 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];
 };
 
 //----------------------------------------------------------------------