Merge user/peter/kinfo branch as of r185547 into head.

This changes struct kinfo_filedesc and kinfo_vmentry such that they are
same on both 32 and 64 bit platforms like i386/amd64 and won't require
sysctl wrapping.

Two new OIDs are assigned.  The old ones are available under
COMPAT_FREEBSD7 - but it isn't that simple.  The superceded interface
was never actually released on 7.x.

The other main change is to pack the data passed to userland via the
sysctl.  kf_structsize and kve_structsize are reduced for the copyout.
If you have a process with 100,000+ sockets open, the unpacked records
require a 132MB+ copyout.  With packing, it is "only" ~35MB.  (Still
seriously unpleasant, but not quite as devastating).  A similar problem
exists for the vmentry structure - have lots and lots of shared libraries
and small mmaps and its copyout gets expensive too.

My immediate problem is valgrind.  It traditionally achieves this
functionality by parsing procfs output, in a packed format.  Secondly, when
tracing 32 bit binaries on amd64 under valgrind, it uses a cross compiled
32 bit binary which ran directly into the differing data structures in 32
vs 64 bit mode.  (valgrind uses this to track file descriptor operations
and this therefore affected every single 32 bit binary)

I've added two utility functions to libutil to unpack the structures into
a fixed record length and to make it a little more convenient to use.

diff --git a/libutil/libutil.h b/libutil/libutil.h
index 186ee2e348f727d8fcc0b93a551c4fb675aaafa1..3187fb37349c94a5b9d4c54e2eccfcbf04692294 100644 (file)
--- a/libutil/libutil.h
+++ b/libutil/libutil.h
@@ -64,6 +64,8 @@ struct termios;
 struct winsize;
 struct utmp;
 struct in_addr;
+struct kinfo_file;
+struct kinfo_vmentry;
 
 __BEGIN_DECLS
 void   clean_environment(const char * const *_white,
@@ -100,6 +102,10 @@ int        realhostname_sa(char *host, size_t hsize, struct sockaddr *addr,
 
 int    kld_isloaded(const char *name);
 int    kld_load(const char *name);
+struct kinfo_file *
+       kinfo_getfile(pid_t _pid, int *_cntp);
+struct kinfo_vmentry *
+       kinfo_getvmmap(pid_t _pid, int *_cntp);
 
 #ifdef _STDIO_H_       /* avoid adding new includes */
 char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);