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 6af52d4ee4b850822bc13cd2043a733c80675a29..3f1a92d271c8f185040350f8ad95d8c144dd0070 100644 (file)
--- a/bsd/kern/kern_malloc.c
+++ b/bsd/kern/kern_malloc.c
@@ -1,24 +1,21 @@
 /*
 /*

- * 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@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.

  * 
  * 

- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE 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@
  */


@@ -71,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>


@@ -86,6 +86,7 @@
 #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>


@@ -210,12 +211,15 @@ struct kmzones {
        0,              KMZ_MALLOC,             /* 88 M_IP6MISC */
        0,              KMZ_MALLOC,             /* 89 M_TSEGQ */
        0,              KMZ_MALLOC,             /* 90 M_IGMP */
        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(journal), KMZ_CREATEZONE,     /* 91 M_JNL_JNL */

        SOS(transaction), KMZ_CREATEZONE,     /* 92 M_JNL_TR */
        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


@@ -277,7 +281,7 @@ struct _mhead {
        char    dat[0];
 };
 
        char    dat[0];
 };
 

-#define ZEROSIZETOKEN 0xFADEDFAD
+#define ZEROSIZETOKEN (void *)0xFADEDFAD

 
 void *_MALLOC(
        size_t          size,
 
 void *_MALLOC(
        size_t          size,


@@ -307,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);
 }