* Split the slab allocator code into separate source files and C++-ified

things a bit.
* Some style cleanup.
* The object depot does now have a cookie that will be passed to the return
  hook.
* Fixed object_cache_return_object_wrapper() using the new cookie.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35174 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/kernel/slab/ObjectDepot.h

@@ -10,13 +10,19 @@
 #include <KernelExport.h>
 
 
-typedef struct object_depot {
-	recursive_lock lock;
-	struct depot_magazine *full, *empty;
-	size_t full_count, empty_count;
-	struct depot_cpu_store *stores;
+struct DepotMagazine;
 
-	void (*return_object)(struct object_depot *depot, void *object);
+typedef struct object_depot {
+	recursive_lock			lock;
+	DepotMagazine*			full;
+	DepotMagazine*			empty;
+	size_t					full_count;
+	size_t					empty_count;
+	struct depot_cpu_store*	stores;
+
+	void*	cookie;
+	void (*return_object)(struct object_depot* depot, void* cookie,
+		void* object);
 } object_depot;
 
 
@@ -24,14 +30,14 @@ typedef struct object_depot {
 extern "C" {
 #endif
 
-status_t object_depot_init(object_depot *depot, uint32 flags,
-	void (*returnObject)(object_depot *, void *));
-void object_depot_destroy(object_depot *depot);
+status_t object_depot_init(object_depot* depot, uint32 flags, void *cookie,
+	void (*returnObject)(object_depot* depot, void* cookie, void* object));
+void object_depot_destroy(object_depot* depot);
 
-void *object_depot_obtain(object_depot *depot);
-int object_depot_store(object_depot *depot, void *object);
+void* object_depot_obtain(object_depot* depot);
+int object_depot_store(object_depot* depot, void* object);
 
-void object_depot_make_empty(object_depot *depot);
+void object_depot_make_empty(object_depot* depot);
 
 #ifdef __cplusplus
 }

headers/private/kernel/slab/Slab.h

@@ -26,37 +26,38 @@ enum {
 	CACHE_DURING_BOOT		= 1 << 31
 };
 
-typedef struct object_cache object_cache;
+struct ObjectCache;
+typedef struct ObjectCache object_cache;
 
-typedef status_t (*object_cache_constructor)(void *cookie, void *object);
-typedef void (*object_cache_destructor)(void *cookie, void *object);
-typedef void (*object_cache_reclaimer)(void *cookie, int32 level);
+typedef status_t (*object_cache_constructor)(void* cookie, void* object);
+typedef void (*object_cache_destructor)(void* cookie, void* object);
+typedef void (*object_cache_reclaimer)(void* cookie, int32 level);
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-object_cache *create_object_cache(const char *name, size_t object_size,
-	size_t alignment, void *cookie, object_cache_constructor constructor,
+object_cache* create_object_cache(const char* name, size_t object_size,
+	size_t alignment, void* cookie, object_cache_constructor constructor,
 	object_cache_destructor);
-object_cache *create_object_cache_etc(const char *name, size_t object_size,
-	size_t alignment, size_t max_byte_usage, uint32 flags, void *cookie,
+object_cache* create_object_cache_etc(const char* name, size_t object_size,
+	size_t alignment, size_t max_byte_usage, uint32 flags, void* cookie,
 	object_cache_constructor constructor, object_cache_destructor destructor,
 	object_cache_reclaimer reclaimer);
 
-void delete_object_cache(object_cache *cache);
+void delete_object_cache(object_cache* cache);
 
-status_t object_cache_set_minimum_reserve(object_cache *cache,
+status_t object_cache_set_minimum_reserve(object_cache* cache,
 	size_t objectCount);
 
-void *object_cache_alloc(object_cache *cache, uint32 flags);
-void object_cache_free(object_cache *cache, void *object);
+void* object_cache_alloc(object_cache* cache, uint32 flags);
+void object_cache_free(object_cache* cache, void* object);
 
-status_t object_cache_reserve(object_cache *cache, size_t object_count,
+status_t object_cache_reserve(object_cache* cache, size_t object_count,
 	uint32 flags);
 
-void object_cache_get_usage(object_cache *cache, size_t *_allocatedMemory);
+void object_cache_get_usage(object_cache* cache, size_t* _allocatedMemory);
 
 #ifdef __cplusplus
 }