From db2078e4f1802434f791f4f1c333725c42fe172b Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Sat, 17 Dec 2011 15:24:05 +0000
Subject: 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.
---
 kern/act.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'kern/act.c')

diff --git a/kern/act.c b/kern/act.c
index d0a03a3..f4f1e31 100644
--- a/kern/act.c
+++ b/kern/act.c
@@ -31,7 +31,7 @@
 #include <mach/kern_return.h>
 #include <mach/alert.h>
 #include <kern/mach_param.h> /* XXX INCALL_... */
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/debug.h>
@@ -47,7 +47,7 @@ static void special_handler(ReturnHandler *rh, struct Act *act);
 #endif
 
 #ifndef ACT_STATIC_KLUDGE
-static zone_t act_zone;
+static struct kmem_cache act_cache;
 #else
 static Act *act_freelist;
 static Act free_acts[ACT_STATIC_KLUDGE];
@@ -68,11 +68,8 @@ void
 global_act_init()
 {
 #ifndef ACT_STATIC_KLUDGE
-	act_zone = zinit(
-			sizeof(struct Act), 0,
-			ACT_MAX * sizeof(struct Act), /* XXX */
-			ACT_CHUNK * sizeof(struct Act),
-			0, "activations");
+	kmem_cache_init(&act_cache, "Act", sizeof(struct Act), 0,
+			NULL, NULL, NULL, 0);
 #else
 	int i;
 
@@ -104,7 +101,7 @@ kern_return_t act_create(task_t task, vm_offset_t user_stack,
 	int rc;
 
 #ifndef ACT_STATIC_KLUDGE
-	act = (Act*)zalloc(act_zone);
+	act = (Act*)kmem_cache_alloc(&act_cache);
 	if (act == 0)
 		return(KERN_RESOURCE_SHORTAGE);
 #else
@@ -170,9 +167,9 @@ static void act_free(Act *inc)
 	/* Drop the task reference.  */
 	task_deallocate(inc->task);
 
-	/* Put the act back on the act zone */
+	/* Put the act back on the act cache */
 #ifndef ACT_STATIC_KLUDGE
-	zfree(act_zone, (vm_offset_t)inc);
+	kmem_cache_free(&act_cache, (vm_offset_t)inc);
 #else
 	/* XXX ipt_lock(act_freelist); */
 	inc->ipt_next = act_freelist;
-- 
cgit v1.2.3