Import the slab allocator

As it is intended to completely replace the zone allocator, remove it on
the way. So long to the venerable code !

* Makefrag.am (libkernel_a_SOURCES): Add kern/slab.{c,h}, remove kern/kalloc.c
and kern/zalloc.{c,h}.
* configfrag.ac (SLAB_VERIFY, SLAB_USE_CPU_POOLS): Add defines.
* i386/Makefrag.am (libkernel_a_SOURCES): Remove i386/i386/zalloc.h.
* i386/configfrag.ac (CPU_L1_SHIFT): Remove define.
* include/mach_debug/slab_info.h: New file.
* kern/slab.c: Likewise.
* kern/slab.h: Likewise.
* i386/i386/zalloc.h: Remove file.
* include/mach_debug/zone_info.h: Likewise.
* kern/kalloc.c: Likewise.
* kern/zalloc.c: Likewise.
* kern/zalloc.h: Likewise.

1 files changed, 29 insertions, 28 deletions

diff --git a/include/mach_debug/zone_info.h b/include/mach_debug/slab_info.h
index 1b36fe02..37dcb8c4 100644
--- a/include/mach_debug/zone_info.h
+++ b/include/mach_debug/slab_info.h
@@ -24,38 +24,39 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_MACH_DEBUG_ZONE_INFO_H_
-#define _MACH_DEBUG_ZONE_INFO_H_
+#ifndef _MACH_DEBUG_SLAB_INFO_H_
+#define _MACH_DEBUG_SLAB_INFO_H_
 
-#include <mach/boolean.h>
-#include <mach/machine/vm_types.h>
+#include <sys/types.h>
 
 /*
  *	Remember to update the mig type definitions
  *	in mach_debug_types.defs when adding/removing fields.
  */
 
-#define ZONE_NAME_MAX_LEN		80
-
-typedef struct zone_name {
-	char		zn_name[ZONE_NAME_MAX_LEN];
-} zone_name_t;
-
-typedef zone_name_t *zone_name_array_t;
-
-
-typedef struct zone_info {
-	integer_t	zi_count;	/* Number of elements used now */
-	vm_size_t	zi_cur_size;	/* current memory utilization */
-	vm_size_t	zi_max_size;	/* how large can this zone grow */
-	vm_size_t	zi_elem_size;	/* size of an element */
-	vm_size_t	zi_alloc_size;	/* size used for more memory */
-/*boolean_t*/integer_t	zi_pageable;	/* zone pageable? */
-/*boolean_t*/integer_t	zi_sleepable;	/* sleep if empty? */
-/*boolean_t*/integer_t	zi_exhaustible;	/* merely return if empty? */
-/*boolean_t*/integer_t	zi_collectable;	/* garbage collect elements? */
-} zone_info_t;
-
-typedef zone_info_t *zone_info_array_t;
-
-#endif	/* _MACH_DEBUG_ZONE_INFO_H_ */
+#define CACHE_NAME_MAX_LEN 32
+
+#define CACHE_FLAGS_NO_CPU_POOL		0x01
+#define CACHE_FLAGS_SLAB_EXTERNAL	0x02
+#define CACHE_FLAGS_NO_RECLAIM		0x04
+#define CACHE_FLAGS_VERIFY		0x08
+#define CACHE_FLAGS_DIRECT		0x10
+
+typedef struct cache_info {
+	int flags;
+	size_t cpu_pool_size;
+	size_t obj_size;
+	size_t align;
+	size_t buf_size;
+	size_t slab_size;
+	unsigned long bufs_per_slab;
+	unsigned long nr_objs;
+	unsigned long nr_bufs;
+	unsigned long nr_slabs;
+	unsigned long nr_free_slabs;
+	char name[CACHE_NAME_MAX_LEN];
+} cache_info_t;
+
+typedef cache_info_t *cache_info_array_t;
+
+#endif	/* _MACH_DEBUG_SLAB_INFO_H_ */