xnu-3248.60.10.tar.gz

[apple/xnu.git] / osfmk / kern / kalloc.h

diff --git a/osfmk/kern/kalloc.h b/osfmk/kern/kalloc.h
index 7966959f2958117d2dc98ad87e6613a7f50e8fae..caad32a3b3f4f699d466e1aaec601d85dce5f19c 100644 (file)
--- a/osfmk/kern/kalloc.h
+++ b/osfmk/kern/kalloc.h
@@ -60,33 +60,64 @@
 #define _KERN_KALLOC_H_
 
 #include <mach/machine/vm_types.h>
+#include <mach/boolean.h>
 #include <sys/cdefs.h>
+#include <mach/vm_types.h>
 
 __BEGIN_DECLS
 
+#if XNU_KERNEL_PRIVATE
+
+extern void *
+kalloc_canblock(
+               vm_size_t              size,
+               boolean_t              canblock,
+               vm_allocation_site_t * site);
+
+#define kalloc(size)                           \
+       ({ static vm_allocation_site_t site __attribute__((section("__DATA, __data"))); \
+       kalloc_canblock((size), TRUE, &site); })
+
+#define kalloc_tag(size, tag)                  \
+       ({ static vm_allocation_site_t site __attribute__((section("__DATA, __data"))) \
+               = { (tag), 0 } ; \
+       kalloc_canblock((size), TRUE, &site); })
+
+#define kalloc_tag_bt(size, tag)               \
+       ({ static vm_allocation_site_t site __attribute__((section("__DATA, __data"))) \
+               = { (tag), VM_TAG_BT }; \
+       kalloc_canblock((size), TRUE, &site); })
+
+#define kalloc_noblock(size)                   \
+       ({ static vm_allocation_site_t site __attribute__((section("__DATA, __data"))); \
+       kalloc_canblock((size), FALSE, &site); })
+
+#define kalloc_noblock_tag_bt(size, tag)       \
+       ({ static vm_allocation_site_t site __attribute__((section("__DATA, __data"))) \
+               = { (tag), VM_TAG_BT }; \
+       kalloc_canblock((size), FALSE, &site); })
+
+extern void kfree(void         *data,
+                 vm_size_t     size);
+
+#else /* XNU_KERNEL_PRIVATE */
+
 extern void *kalloc(vm_size_t  size);
 
 extern void *kalloc_noblock(vm_size_t  size);
 
-extern void *kget(vm_size_t    size);
-
 extern void kfree(void         *data,
                  vm_size_t     size);
 
+#endif /* !XNU_KERNEL_PRIVATE */
+
 __END_DECLS
 
 #ifdef MACH_KERNEL_PRIVATE
 
-#include <kern/lock.h>
-
-#define KALLOC_MINSIZE         16
-
-extern void            kalloc_init(void) __attribute__((section("__TEXT, initcode")));
+extern void            kalloc_init(void);
 
-extern void            krealloc(void           **addrp,
-                                vm_size_t      old_size,
-                                vm_size_t      new_size,
-                                simple_lock_t  lock);
+extern void            kalloc_fake_zone_init( int );
 
 extern void            kalloc_fake_zone_info(
                                int             *count,
@@ -94,8 +125,10 @@ extern void         kalloc_fake_zone_info(
                                vm_size_t       *max_size,
                                vm_size_t       *elem_size,
                                vm_size_t       *alloc_size,
+                               uint64_t        *sum_size,
                                int             *collectable,
-                               int             *exhaustable);
+                               int             *exhaustable,
+                               int             *caller_acct);
 
 extern vm_size_t kalloc_max_prerounded;
 extern vm_size_t kalloc_large_total;