xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / sys / malloc.h

diff --git a/bsd/sys/malloc.h b/bsd/sys/malloc.h
index fb05b87343c8fb5309fa08f3da11a449c2892d88..0e68c66635014e8690a80b0bd6703ddaf239c87f 100644 (file)
--- a/bsd/sys/malloc.h
+++ b/bsd/sys/malloc.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -68,6 +68,7 @@
  */
 #define        M_WAITOK        0x0000
 #define        M_NOWAIT        0x0001
  */
 #define        M_WAITOK        0x0000
 #define        M_NOWAIT        0x0001

+#define M_ZERO          0x0004          /* bzero the allocation */

 
 /*
  * Types of memory to be allocated (not all are used by us)
 
 /*
  * Types of memory to be allocated (not all are used by us)


@@ -164,8 +165,12 @@
 #define M_IP6MISC      88      /* IPv6 misc. memory */
 #define M_TSEGQ                89      /* TCP segment queue entry */
 #define M_IGMP         90
 #define M_IP6MISC      88      /* IPv6 misc. memory */
 #define M_TSEGQ                89      /* TCP segment queue entry */
 #define M_IGMP         90

+#define M_JNL_JNL   91  /* Journaling: "struct journal" */
+#define M_JNL_TR    92  /* Journaling: "struct transaction" */ 
+#define        M_SPECINFO      93      /* special file node */
+#define M_KQUEUE       94      /* kqueue */

 
 

-#define        M_LAST          91      /* Must be last type + 1 */
+#define        M_LAST          95      /* Must be last type + 1 */

 
 /* Strings corresponding to types of memory */
 /* Must be in synch with the #defines above */
 
 /* Strings corresponding to types of memory */
 /* Must be in synch with the #defines above */


@@ -255,12 +260,16 @@
        "DEVFS",        /* 82 M_DEVFS */ \
        "IpFw/IpAcct",  /* 83 M_IPFW */ \
        "UDF node",     /* 84 M_UDFNODE */ \
        "DEVFS",        /* 82 M_DEVFS */ \
        "IpFw/IpAcct",  /* 83 M_IPFW */ \
        "UDF node",     /* 84 M_UDFNODE */ \

-       "UDF mount"     /* 85 M_UDFMNT */ \
+       "UDF mount",    /* 85 M_UDFMNT */ \

        "IPv6 NDP",     /* 86 M_IP6NDP */ \
        "IPv6 options", /* 87 M_IP6OPT */ \
        "IPv6 NDP",     /* 86 M_IP6NDP */ \
        "IPv6 options", /* 87 M_IP6OPT */ \

-       "IPv6 Misc"     /* 88 M_IP6MISC */\
-       "TCP Segment Q" /* 89 M_TSEGQ */\
-       "IGMP state"    /* 90 M_IGMP */\
+       "IPv6 Misc",    /* 88 M_IP6MISC */\
+       "TCP Segment Q",/* 89 M_TSEGQ */\
+       "IGMP state",   /* 90 M_IGMP */\
+       "Journal",    /* 91 M_JNL_JNL */\
+       "Transaction",    /* 92 M_JNL_TR */\
+       "specinfo",             /* 93 M_SPECINFO */\
+       "kqueue"                /* 94 M_KQUEUE */\

 }
 
 struct kmemstats {
 }
 
 struct kmemstats {