xnu-344.21.74.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..6af52d4ee4b850822bc13cd2043a733c80675a29 100644 (file)
--- a/bsd/kern/kern_malloc.c
+++ b/bsd/kern/kern_malloc.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -75,11 +78,11 @@
 #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>


@@ -90,6 +93,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 +195,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,8 +207,11 @@ 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 */

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


@@ -217,6 +225,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 +277,8 @@ struct _mhead {
        char    dat[0];
 };
 
        char    dat[0];
 };
 

+#define ZEROSIZETOKEN 0xFADEDFAD
+

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


@@ -275,8 +290,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);


@@ -300,8 +319,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);