Distribute and statizice a lot of the malloc M_* types.

Substantial input from:	bde

14 files changed, 44 insertions, 14 deletions

diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index e462198..5c765e4 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.c,v 1.8 1997/02/22 09:38:58 peter Exp $
+ * $Id: inflate.c,v 1.9 1997/08/02 14:31:25 bde Exp $
  *
  *
  */
@@ -19,6 +19,8 @@
 #endif
 #include <sys/malloc.h>
 
+MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees");
+
 /* needed to make inflate() work */
 #define	uch u_char
 #define	ush u_short
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index dc28e21..442c17a 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.39 1997/08/26 00:09:44 bde Exp $
+ * $Id: kern_descrip.c,v 1.40 1997/09/14 02:52:13 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,6 +66,8 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
+MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table");
+
 static	 d_open_t  fdopen;
 #define NUMFDESC 64
 
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 5bb70a8..58a7d41 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.55 1997/09/13 19:42:10 joerg Exp $
+ * $Id: kern_exit.c,v 1.56 1997/09/21 22:00:10 gibbs Exp $
  */
 
 #include "opt_ktrace.h"
@@ -70,6 +70,8 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
+MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status");
+
 static int wait1 __P((struct proc *, struct wait_args *, int [], int));
 
 /*
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index f8e4e25..3c52aed 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id: kern_ktrace.c,v 1.17 1997/02/22 09:39:05 peter Exp $
+ * $Id: kern_ktrace.c,v 1.18 1997/03/23 03:36:19 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -47,6 +47,8 @@
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 
+MALLOC_DEFINE(M_KTRACE, "KTRACE", "KTRACE");
+
 #ifdef KTRACE
 static struct ktr_header *ktrgetheader __P((int type));
 static void ktrwrite __P((struct vnode *, struct ktr_header *));
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 000e645..f8adbcc 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
- * $Id: kern_lockf.c,v 1.13 1997/02/22 09:39:06 peter Exp $
+ * $Id: kern_lockf.c,v 1.14 1997/04/01 10:30:06 bde Exp $
  */
 
 #include <sys/param.h>
@@ -60,10 +60,13 @@ static int maxlockdepth = MAXDEPTH;
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 
+
 static int	lockf_debug = 0;
 SYSCTL_INT(_debug, OID_AUTO, lockf_debug, CTLFLAG_RW, &lockf_debug, 0, "");
 #endif
 
+MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures");
+
 #define NOLOCKF (struct lockf *)0
 #define SELF	0x1
 #define OTHERS	0x2
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 21c153f..1c79805 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.27 1997/06/27 15:42:05 tegge Exp $
+ * $Id: kern_proc.c,v 1.28 1997/08/02 14:31:33 bde Exp $
  */
 
 #include <sys/param.h>
@@ -48,6 +48,8 @@
 #include <vm/vm_map.h>
 #include <sys/user.h>
 
+MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
+
 struct prochd qs[NQS];		/* as good a place as any... */
 struct prochd rtqs[NQS];	/* Space for REALTIME queues too */
 struct prochd idqs[NQS];	/* Space for IDLE queues too */
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index fe90f25..27e4e84 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.69 1997/02/22 09:39:12 peter Exp $
+ * $Id: kern_sysctl.c,v 1.70 1997/04/09 15:23:09 bde Exp $
  */
 
 #include <sys/param.h>
@@ -51,6 +51,8 @@
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
+MALLOC_DEFINE(M_SYSCTL, "sysctl", "sysctl internal magic");
+
 /*
  * Locking and stats
  */
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 08ba35f..09e233d 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id$
+ * $Id: subr_prof.c,v 1.20 1997/02/22 09:39:17 peter Exp $
  */
 
 #include <sys/param.h>
@@ -48,6 +48,8 @@
 #include <sys/malloc.h>
 #include <sys/gmon.h>
 
+MALLOC_DEFINE(M_GPROF, "gprof", "kernel profiling buffer");
+
 static void kmstartup __P((void *));
 SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL)
 
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 3c17bed..709fe27 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.28 1997/09/02 20:05:52 bde Exp $
+ * $Id: sys_generic.c,v 1.29 1997/09/14 02:30:32 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -61,6 +61,9 @@
 #include <sys/ktrace.h>
 #endif
 
+MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer");
+MALLOC_DEFINE(M_SELECT, "select", "select() buffer");
+
 static int	selscan __P((struct proc *, fd_mask **, fd_mask **, int, int *));
 static int	pollscan __P((struct proc *, struct pollfd *, int, int *));
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index be68b1b..67251ea 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.28 1997/02/22 09:39:23 peter Exp $ */
+/*	$Id: sysv_shm.c,v 1.29 1997/08/02 14:31:39 bde Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -65,6 +65,8 @@ struct shmget_args;
 extern int shmget __P((struct proc *p, struct shmget_args *uap, int *retval));
 #endif
 
+MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments");
+
 static void shminit __P((void *));
 SYSINIT(sysv_shm, SI_SUB_SYSV_SHM, SI_ORDER_FIRST, shminit, NULL)
 
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 8b4ee74..8d5c3a3 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.5 1997/10/09 04:14:41 dyson Exp $
+ * $Id: vfs_aio.c,v 1.6 1997/10/11 01:07:03 dyson Exp $
  */
 
 /*
@@ -54,6 +54,8 @@
 
 #include <machine/cpu.h>
 
+MALLOC_DEFINE(M_AIO, "AIO", "AIO structure(s)");
+
 #define AIOCBLIST_CANCELLED	0x1
 #define AIOCBLIST_RUNDOWN	0x4
 #define AIOCBLIST_ASYNCFREE	0x8
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 44cc200..f7fb4f1 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.127 1997/09/21 04:49:30 dyson Exp $
+ * $Id: vfs_bio.c,v 1.128 1997/09/21 22:00:25 gibbs Exp $
  */
 
 /*
@@ -60,6 +60,8 @@
 
 #include <miscfs/specfs/specdev.h>
 
+MALLOC_DEFINE(M_BIOBUF, "BIO buffer", "BIO buffer");
+
 static void vfs_update __P((void));
 static struct	proc *updateproc;
 static struct kproc_desc up_kp = {
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 2306ad0..2969c8a 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.107 1997/09/26 08:08:58 phk Exp $
+ * $Id: vfs_subr.c,v 1.108 1997/10/11 07:34:27 phk Exp $
  */
 
 /*
@@ -68,6 +68,8 @@
 
 #include <miscfs/specfs/specdev.h>
 
+MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
+
 #ifdef DDB
 extern void	printlockedvnodes __P((void));
 #endif
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 2306ad0..2969c8a 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.107 1997/09/26 08:08:58 phk Exp $
+ * $Id: vfs_subr.c,v 1.108 1997/10/11 07:34:27 phk Exp $
  */
 
 /*
@@ -68,6 +68,8 @@
 
 #include <miscfs/specfs/specdev.h>
 
+MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
+
 #ifdef DDB
 extern void	printlockedvnodes __P((void));
 #endif