Loading...
--- libmalloc/libmalloc-792.80.2/src/magazine_zone.h
+++ libmalloc/libmalloc-646.0.13/src/magazine_zone.h
@@ -735,11 +735,11 @@
typedef struct large_entry_s {
vm_address_t address;
vm_size_t size;
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
- mach_vm_reclaim_id_t reclaim_index;
+#if CONFIG_DEFERRED_RECLAIM
+ uint64_t reclaim_index;
#else
boolean_t did_madvise_reusable;
-#endif /* CONFIG_MAGAZINE_DEFERRED_RECLAIM */
+#endif /* CONFIG_DEFERRED_RECLAIM */
} large_entry_t;
#if !CONFIG_LARGE_CACHE && DEBUG_MALLOC
@@ -785,7 +785,7 @@
// Take magazine_lock first, Depot lock when needed for recirc, then szone->{tiny,small}_regions_lock when needed for alloc
_malloc_lock_s magazine_lock MALLOC_CACHE_ALIGN;
// Protection for the crtical section that does allocate_pages outside the magazine_lock
- _malloc_lock_s magazine_alloc_lock;
+ volatile boolean_t alloc_underway;
// One element deep "death row", optimizes malloc/free/malloc for identical size.
void *mag_last_free;