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.
---
 vm/memory_object_proxy.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'vm/memory_object_proxy.c')

diff --git a/vm/memory_object_proxy.c b/vm/memory_object_proxy.c
index fdab6e0..9c0528c 100644
--- a/vm/memory_object_proxy.c
+++ b/vm/memory_object_proxy.c
@@ -41,15 +41,15 @@
 #include <mach/notify.h>
 #include <mach/vm_prot.h>
 #include <kern/printf.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <kern/mach_param.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_space.h>
 
 #include <vm/memory_object_proxy.h>
 
-/* The zone which holds our proxy memory objects.  */
-static zone_t memory_object_proxy_zone;
+/* The cache which holds our proxy memory objects.  */
+static struct kmem_cache memory_object_proxy_cache;
 
 struct memory_object_proxy
 {
@@ -64,13 +64,8 @@ typedef struct memory_object_proxy *memory_object_proxy_t;
 void
 memory_object_proxy_init (void)
 {
-  /* For limit, see PORT_MAX.  */
-  memory_object_proxy_zone = zinit (sizeof (struct memory_object_proxy), 0,
-				    (TASK_MAX * 3 + THREAD_MAX)
-				    * sizeof (struct memory_object_proxy),
-				    256 * sizeof (struct memory_object_proxy),
-				    ZONE_EXHAUSTIBLE,
-				    "proxy memory object zone");
+  kmem_cache_init (&memory_object_proxy_cache, "memory_object_proxy",
+		   sizeof (struct memory_object_proxy), 0, NULL, NULL, NULL, 0);
 }
   
 /* Lookup a proxy memory object by its port.  */
@@ -153,13 +148,13 @@ memory_object_create_proxy (ipc_space_t space, vm_prot_t max_protection,
   if (start[0] != 0 || len[0] != (vm_offset_t) ~0)
     return KERN_INVALID_ARGUMENT;
 
-  proxy = (memory_object_proxy_t) zalloc (memory_object_proxy_zone);
+  proxy = (memory_object_proxy_t) kmem_cache_alloc (&memory_object_proxy_cache);
 
   /* Allocate port, keeping a reference for it.  */
   proxy->port = ipc_port_alloc_kernel ();
   if (proxy->port == IP_NULL)
     {
-      zfree (memory_object_proxy_zone, (vm_offset_t) proxy);
+      kmem_cache_free (&memory_object_proxy_cache, (vm_offset_t) proxy);
       return KERN_RESOURCE_SHORTAGE;
     }
   /* Associate the port with the proxy memory object.  */
-- 
cgit v1.2.3