xnu-517.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 cf158f9b22e3dd69b30e9d5bf672d0b021409f5d..2090235adbe19756660922b163461cbc9e3b7c8f 100644 (file)
--- a/bsd/kern/kern_malloc.c
+++ b/bsd/kern/kern_malloc.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @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,
- * 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@
  */
@@ -68,6 +71,9 @@
 #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>
@@ -83,6 +89,7 @@
 #include <isofs/cd9660/cd9660_node.h>
 
 #include <miscfs/volfs/volfs.h>
+#include <miscfs/specfs/specdev.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
@@ -90,6 +97,8 @@
 #include <nfs/nfsmount.h>
 #include <nfs/nqnfs.h>
 
+#include <vfs/vfs_journal.h>
+
 #include <mach/mach_types.h>
 
 #include <kern/zalloc.h>
@@ -205,11 +214,15 @@ struct kmzones {
        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
 };
 
+extern zone_t kalloc_zone(vm_size_t);  /* XXX */
 
 /*
  * Initialize the kernel memory allocator
@@ -219,6 +232,11 @@ kmeminit(void)
 {
        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 */
@@ -266,7 +284,7 @@ struct _mhead {
        char    dat[0];
 };
 
-#define ZEROSIZETOKEN 0xFADEDFAD
+#define ZEROSIZETOKEN (void *)0xFADEDFAD
 
 void *_MALLOC(
        size_t          size,
@@ -296,6 +314,9 @@ void *_MALLOC(
 
        mem->hdr.mlen = memsize;
 
+       if (flags & M_ZERO)
+               bzero(mem->hdr.dat, size);
+
        return  (mem->hdr.dat);
 }