Adjust the kernel to use the slab allocator

* device/dev_lookup.c: Replace zalloc header, types and function calls
with their slab counterparts.
* device/dev_pager.c: Likewise.
* device/ds_routines.c: Likewise.
* device/io_req.h: Likewise.
* device/net_io.c: Likewise.
* i386/i386/fpu.c: Likewise.
* i386/i386/io_perm.c: Likewise.
* i386/i386/machine_task.c: Likewise.
* i386/i386/pcb.c: Likewise.
* i386/i386/task.h: Likewise.
* i386/intel/pmap.c: Likewise.
* i386/intel/pmap.h: Remove #include <kernel/zalloc.h>.
* include/mach_debug/mach_debug.defs (host_zone_info): Replace
routine declaration with skip directive.
(host_slab_info): New routine declaration.
* include/mach_debug/mach_debug_types.defs (zone_name_t)
(zone_name_array_t, zone_info_t, zone_info_array_t): Remove types.
(cache_info_t, cache_info_array_t): New types.
* include/mach_debug/mach_debug_types.h: Replace #include
<mach_debug/zone_info.h> with <mach_debug/slab_info.h>.
* ipc/ipc_entry.c: Replace zalloc header, types and function calls with
their slab counterparts.
* ipc/ipc_entry.h: Likewise.
* ipc/ipc_init.c: Likewise.
* ipc/ipc_marequest.c: Likewise.
* ipc/ipc_object.c: Likewise.
* ipc/ipc_object.h: Likewise.
* ipc/ipc_space.c: Likewise.
* ipc/ipc_space.h: Likewise.
* ipc/ipc_table.c (kalloc_map): Remove extern declaration.
* kern/act.c: Replace zalloc header, types and function calls with their
slab counterparts.
* kern/kalloc.h: Add #include <vm/vm_types.h>.
(MINSIZE): Remove definition.
(kalloc_map): Add extern declaration.
(kget): Remove prototype.
* kern/mach_clock.c: Adjust comment.
* kern/processor.c: Replace zalloc header, types and function calls with
their slab counterparts.
* kern/startup.c: Remove #include <kernel/zalloc.h>.
* kern/task.c: Replace zalloc header, types and function calls with
their slab counterparts.
* kern/thread.c: Likewise.
* vm/memory_object_proxy.c: Likewise.
* vm/vm_external.c: Likewise.
* vm/vm_fault.c: Likewise.
* vm/vm_init.c: Likewise.
* vm/vm_map.c: Likewise.
* vm/vm_object.c: Likewise.
* vm/vm_page.h: Remove #include <kernel/zalloc.h>.
* vm/vm_pageout.c: Replace zalloc header, types and function calls with
their slab counterparts.
* vm/vm_resident.c: Likewise.
(zdata, zdata_size): Remove declarations.
(vm_page_bootstrap): Don't steal memory for the zone system.

1 files changed, 18 insertions, 25 deletions

diff --git a/vm/vm_external.c b/vm/vm_external.c
index ac47faa..e9643ff 100644
--- a/vm/vm_external.c
+++ b/vm/vm_external.c
@@ -31,7 +31,7 @@
  */
 
 #include <mach/boolean.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <vm/vm_external.h>
 #include <mach/vm_param.h>
 #include <kern/assert.h>
@@ -40,7 +40,7 @@
 
 boolean_t	vm_external_unsafe = FALSE;
 
-zone_t		vm_external_zone = ZONE_NULL;
+struct kmem_cache	vm_external_cache;
 
 /*
  *	The implementation uses bit arrays to record whether
@@ -52,8 +52,8 @@ zone_t		vm_external_zone = ZONE_NULL;
 #define		SMALL_SIZE	(VM_EXTERNAL_SMALL_SIZE/8)
 #define		LARGE_SIZE	(VM_EXTERNAL_LARGE_SIZE/8)
 
-zone_t		vm_object_small_existence_map_zone;
-zone_t		vm_object_large_existence_map_zone;
+struct kmem_cache	vm_object_small_existence_map_cache;
+struct kmem_cache	vm_object_large_existence_map_cache;
 
 
 vm_external_t	vm_external_create(size)
@@ -62,20 +62,17 @@ vm_external_t	vm_external_create(size)
 	vm_external_t	result;
 	vm_size_t	bytes;
 	
-	if (vm_external_zone == ZONE_NULL)
-		return(VM_EXTERNAL_NULL);
-
-	result = (vm_external_t) zalloc(vm_external_zone);
+	result = (vm_external_t) kmem_cache_alloc(&vm_external_cache);
 	result->existence_map = (char *) 0;
 
 	bytes = (atop(size) + 07) >> 3;
 	if (bytes <= SMALL_SIZE) {
 		result->existence_map =
-		 (char *) zalloc(vm_object_small_existence_map_zone);
+		 (char *) kmem_cache_alloc(&vm_object_small_existence_map_cache);
 		result->existence_size = SMALL_SIZE;
 	} else if (bytes <= LARGE_SIZE) {
 		result->existence_map =
-		 (char *) zalloc(vm_object_large_existence_map_zone);
+		 (char *) kmem_cache_alloc(&vm_object_large_existence_map_cache);
 		result->existence_size = LARGE_SIZE;
 	}
 	return(result);
@@ -89,14 +86,14 @@ void		vm_external_destroy(e)
 
 	if (e->existence_map != (char *) 0) {
 		if (e->existence_size <= SMALL_SIZE) {
-			zfree(vm_object_small_existence_map_zone,
+			kmem_cache_free(&vm_object_small_existence_map_cache,
 				(vm_offset_t) e->existence_map);
 		} else {
-			zfree(vm_object_large_existence_map_zone,
+			kmem_cache_free(&vm_object_large_existence_map_cache,
 				(vm_offset_t) e->existence_map);
 		}
 	}
-	zfree(vm_external_zone, (vm_offset_t) e);
+	kmem_cache_free(&vm_external_cache, (vm_offset_t) e);
 }
 
 vm_external_state_t _vm_external_state_get(e, offset)
@@ -142,18 +139,14 @@ void		vm_external_module_initialize(void)
 {
 	vm_size_t	size = (vm_size_t) sizeof(struct vm_external);
 
-	vm_external_zone = zinit(size, 0, 16*1024*size, size,
-				 0, "external page bitmaps");
+	kmem_cache_init(&vm_external_cache, "vm_external", size, 0,
+			NULL, NULL, NULL, 0);
 
-	vm_object_small_existence_map_zone = zinit(SMALL_SIZE, 0,
-					round_page(LARGE_SIZE * SMALL_SIZE),
-					round_page(SMALL_SIZE),
-					ZONE_EXHAUSTIBLE,
-					"object small existence maps");
+	kmem_cache_init(&vm_object_small_existence_map_cache,
+			"small_existence_map", SMALL_SIZE, 0,
+			NULL, NULL, NULL, 0);
 
-	vm_object_large_existence_map_zone = zinit(LARGE_SIZE, 0,
-					round_page(8 * LARGE_SIZE),
-					round_page(LARGE_SIZE),
-					ZONE_EXHAUSTIBLE,
-					"object large existence maps");
+	kmem_cache_init(&vm_object_large_existence_map_cache,
+			"large_existence_map", LARGE_SIZE, 0,
+			NULL, NULL, NULL, 0);
 }