xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / kern / kern_malloc.c

diff --git a/bsd/kern/kern_malloc.c b/bsd/kern/kern_malloc.c
index 24086441bf1b18e48b8c4b156ac7066c4f939254..3f1a92d271c8f185040350f8ad95d8c144dd0070 100644 (file)
--- a/bsd/kern/kern_malloc.c
+++ b/bsd/kern/kern_malloc.c
@@ -1,5 +1,5 @@
 /*
 /*

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

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


@@ -68,6 +68,9 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 

+#include <sys/event.h>
+#include <sys/eventvar.h>
+

 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>


@@ -75,14 +78,15 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/tty.h>

+#include <sys/quota.h>

 
 

-#include <ufs/ufs/quota.h>

 #include <ufs/ufs/inode.h>
 
 #include <ufs/ufs/inode.h>
 

-#include <hfs/hfs.h>
+#include <hfs/hfs_cnode.h>

 #include <isofs/cd9660/cd9660_node.h>
 
 #include <miscfs/volfs/volfs.h>
 #include <isofs/cd9660/cd9660_node.h>
 
 #include <miscfs/volfs/volfs.h>

+#include <miscfs/specfs/specdev.h>

 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>


@@ -90,6 +94,8 @@
 #include <nfs/nfsmount.h>
 #include <nfs/nqnfs.h>
 
 #include <nfs/nfsmount.h>
 #include <nfs/nqnfs.h>
 

+#include <vfs/vfs_journal.h>
+

 #include <mach/mach_types.h>
 
 #include <kern/zalloc.h>
 #include <mach/mach_types.h>
 
 #include <kern/zalloc.h>


@@ -190,8 +196,8 @@ struct kmzones {
                        KMZ_CREATEZONE,         /* 73 M_OFILETABL */
        MCLBYTES,       KMZ_CREATEZONE,         /* 74 M_MCLUST */
        SOX(hfsmount),  KMZ_LOOKUPZONE,         /* 75 M_HFSMNT */
                        KMZ_CREATEZONE,         /* 73 M_OFILETABL */
        MCLBYTES,       KMZ_CREATEZONE,         /* 74 M_MCLUST */
        SOX(hfsmount),  KMZ_LOOKUPZONE,         /* 75 M_HFSMNT */

-       SOS(hfsnode),   KMZ_CREATEZONE,         /* 76 M_HFSNODE */
-       SOS(hfsfilemeta),       KMZ_CREATEZONE, /* 77 M_HFSFMETA */
+       SOS(cnode),     KMZ_CREATEZONE,         /* 76 M_HFSNODE */
+       SOS(filefork),  KMZ_CREATEZONE,         /* 77 M_HFSFORK */

        SOX(volfs_mntdata),     KMZ_LOOKUPZONE,         /* 78 M_VOLFSMNT */
        SOS(volfs_vndata),      KMZ_CREATEZONE,         /* 79 M_VOLFSNODE */
        0,              KMZ_MALLOC,             /* 80 M_TEMP */
        SOX(volfs_mntdata),     KMZ_LOOKUPZONE,         /* 78 M_VOLFSMNT */
        SOS(volfs_vndata),      KMZ_CREATEZONE,         /* 79 M_VOLFSNODE */
        0,              KMZ_MALLOC,             /* 80 M_TEMP */


@@ -202,12 +208,18 @@ struct kmzones {
        0,              KMZ_MALLOC,             /* 85 M_UDFMOUNT */
        0,              KMZ_MALLOC,             /* 86 M_IP6NDP */
        0,              KMZ_MALLOC,             /* 87 M_IP6OPT */
        0,              KMZ_MALLOC,             /* 85 M_UDFMOUNT */
        0,              KMZ_MALLOC,             /* 86 M_IP6NDP */
        0,              KMZ_MALLOC,             /* 87 M_IP6OPT */

-       0,              KMZ_MALLOC,             /* 88 M_NATPT */
-
+       0,              KMZ_MALLOC,             /* 88 M_IP6MISC */
+       0,              KMZ_MALLOC,             /* 89 M_TSEGQ */
+       0,              KMZ_MALLOC,             /* 90 M_IGMP */
+       SOS(journal), KMZ_CREATEZONE,     /* 91 M_JNL_JNL */
+       SOS(transaction), KMZ_CREATEZONE,     /* 92 M_JNL_TR */
+       SOS(specinfo), KMZ_CREATEZONE,          /* 93 M_SPECINFO */
+       SOS(kqueue), KMZ_CREATEZONE,            /* 94 M_KQUEUE */

 #undef SOS
 #undef SOX
 };
 
 #undef SOS
 #undef SOX
 };
 

+extern zone_t kalloc_zone(vm_size_t);  /* XXX */

 
 /*
  * Initialize the kernel memory allocator
 
 /*
  * Initialize the kernel memory allocator


@@ -217,6 +229,11 @@ kmeminit(void)
 {
        struct kmzones  *kmz;
 
 {
        struct kmzones  *kmz;
 

+       if ((sizeof(kmzones)/sizeof(kmzones[0])) != (sizeof(memname)/sizeof(memname[0]))) {
+               panic("kmeminit: kmzones has %d elements but memname has %d\n",
+                         (sizeof(kmzones)/sizeof(kmzones[0])), (sizeof(memname)/sizeof(memname[0])));
+       }
+

        kmz = kmzones;
        while (kmz < &kmzones[M_LAST]) {
 /* XXX */
        kmz = kmzones;
        while (kmz < &kmzones[M_LAST]) {
 /* XXX */


@@ -264,6 +281,8 @@ struct _mhead {
        char    dat[0];
 };
 
        char    dat[0];
 };
 

+#define ZEROSIZETOKEN (void *)0xFADEDFAD
+

 void *_MALLOC(
        size_t          size,
        int             type,
 void *_MALLOC(
        size_t          size,
        int             type,


@@ -275,8 +294,12 @@ void *_MALLOC(
        if (type >= M_LAST)
                panic("_malloc TYPE");
 
        if (type >= M_LAST)
                panic("_malloc TYPE");
 

+       /*
+        * On zero request we do not return zero as that
+        * could be mistaken for ENOMEM.
+        */

        if (size == 0)
        if (size == 0)

-               return (0);
+               return (ZEROSIZETOKEN);

 
        if (flags & M_NOWAIT) {
                mem = (void *)kalloc_noblock(memsize);
 
        if (flags & M_NOWAIT) {
                mem = (void *)kalloc_noblock(memsize);


@@ -288,6 +311,9 @@ void *_MALLOC(
 
        mem->hdr.mlen = memsize;
 
 
        mem->hdr.mlen = memsize;
 

+       if (flags & M_ZERO)
+               bzero(mem->hdr.dat, size);
+

        return  (mem->hdr.dat);
 }
 
        return  (mem->hdr.dat);
 }
 


@@ -300,8 +326,10 @@ void _FREE(
        if (type >= M_LAST)
                panic("_free TYPE");
 
        if (type >= M_LAST)
                panic("_free TYPE");
 

-       if (!addr)
+       if (addr == (void *)ZEROSIZETOKEN)

                return;
                return;

+       if (!addr)
+               return; /* correct (convenient bsd kernel legacy) */

 
        hdr = addr; hdr--;
        kfree((vm_offset_t)hdr, hdr->mlen);
 
        hdr = addr; hdr--;
        kfree((vm_offset_t)hdr, hdr->mlen);