Loading...
--- libmalloc/libmalloc-409.40.6/src/magazine_tiny.c
+++ libmalloc/libmalloc-521.120.7/src/magazine_tiny.c
@@ -38,25 +38,6 @@
// reduce the msize part below zero (not checked).
#define TINY_MAG_LAST_FREE_PTR_DEC_MSIZE(x, msize_delta) (x) = ((void *)(x) - (msize_delta))
-static MALLOC_INLINE MALLOC_ALWAYS_INLINE
-mag_index_t
-tiny_mag_get_thread_index(void)
-{
-#if CONFIG_TINY_USES_HYPER_SHIFT
- if (os_likely(_os_cpu_number_override == -1)) {
- return _malloc_cpu_number() >> hyper_shift;
- } else {
- return _os_cpu_number_override >> hyper_shift;
- }
-#else // CONFIG_SMALL_USES_HYPER_SHIFT
- if (os_likely(_os_cpu_number_override == -1)) {
- return _malloc_cpu_number();
- } else {
- return _os_cpu_number_override;
- }
-#endif // CONFIG_SMALL_USES_HYPER_SHIFT
-}
-
static inline grain_t
tiny_slot_from_msize(msize_t msize)
{
@@ -205,7 +186,7 @@
static MALLOC_INLINE void
zero_tiny_free_inline_meta(void *ptr, msize_t msize)
{
- if (malloc_zero_on_free) {
+ if (malloc_zero_policy == MALLOC_ZERO_ON_FREE) {
*((tiny_free_list_t *)ptr) = (tiny_free_list_t){ 0 };
if (msize > 1) {
TINY_FREE_SIZE(ptr) = 0;
@@ -220,7 +201,7 @@
static MALLOC_INLINE void
zero_tiny_free_inline_meta_following(void *ptr, msize_t msize)
{
- if (malloc_zero_on_free) {
+ if (malloc_zero_policy == MALLOC_ZERO_ON_FREE) {
if (msize > 1) {
void *follower = FOLLOWING_TINY_PTR(ptr, msize);
TINY_PREVIOUS_MSIZE(follower) = 0;
@@ -283,17 +264,23 @@
}
static MALLOC_INLINE void
-tiny_check_zero_and_clear(void *ptr, msize_t msize, boolean_t clear)
-{
- if (malloc_zero_on_free) {
+tiny_check_zero_or_clear(void *ptr, msize_t msize, boolean_t clear)
+{
+ switch (malloc_zero_policy) {
+ case MALLOC_ZERO_ON_FREE:
if (zero_on_free_should_sample() &&
_malloc_memcmp_zero_aligned8(ptr, TINY_BYTES_FOR_MSIZE(msize))) {
tiny_zero_corruption_abort(ptr, msize);
}
- } else {
- if (clear) {
- memset(ptr, '\0', TINY_BYTES_FOR_MSIZE(msize));
- }
+ break;
+ case MALLOC_ZERO_NONE:
+ if (!clear) {
+ break;
+ }
+ // fall through
+ case MALLOC_ZERO_ON_ALLOC:
+ memset(ptr, '\0', TINY_BYTES_FOR_MSIZE(msize));
+ break;
}
}
@@ -342,7 +329,7 @@
tiny_check_and_zero_inline_meta_from_freelist(rack_t *rack, void *ptr,
msize_t msize)
{
- if (!malloc_zero_on_free) {
+ if (malloc_zero_policy != MALLOC_ZERO_ON_FREE) {
return;
}
@@ -1506,7 +1493,7 @@
msize += next_msize;
}
- if (!malloc_zero_on_free) {
+ if (malloc_zero_policy != MALLOC_ZERO_ON_FREE) {
// The tiny cache already scribbles free blocks as they go through the
// cache, so we do not need to do it here.
//
@@ -1781,7 +1768,7 @@
trailer->objects_in_use--;
}
set_tiny_meta_header_middle(next_block);
- tiny_check_zero_and_clear(last_free_ptr, coalesced_msize, false);
+ tiny_check_zero_or_clear(last_free_ptr, coalesced_msize, false);
coalesced_msize = 0; // No net change in memory use
} else {
#endif // CONFIG_TINY_CACHE
@@ -1806,7 +1793,7 @@
// Mark the first block of the remaining free area as a header and in-use.
set_tiny_meta_header_in_use_1(ptr + TINY_BYTES_FOR_MSIZE(new_msize));
}
- tiny_check_zero_and_clear(unused_start, coalesced_msize, false);
+ tiny_check_zero_or_clear(unused_start, coalesced_msize, false);
} else {
/*
* Look for a free block immediately afterwards. If it's large
@@ -1830,7 +1817,7 @@
set_tiny_meta_header_middle(next_block); // clear the meta_header to enable coalescing backwards
tiny_check_and_zero_inline_meta_from_freelist(rack, next_block, next_msize);
- tiny_check_zero_and_clear(next_block, coalesced_msize, false);
+ tiny_check_zero_or_clear(next_block, coalesced_msize, false);
leftover_msize = next_msize - coalesced_msize;
if (leftover_msize) {
@@ -2409,7 +2396,7 @@
tiny_malloc_should_clear(rack_t *rack, msize_t msize, boolean_t cleared_requested)
{
void *ptr;
- mag_index_t mag_index = tiny_mag_get_thread_index() % rack->num_magazines;
+ mag_index_t mag_index = rack_get_thread_index(rack) % rack->num_magazines;
magazine_t *tiny_mag_ptr = &(rack->magazines[mag_index]);
MALLOC_TRACE(TRACE_tiny_malloc, (uintptr_t)rack, TINY_BYTES_FOR_MSIZE(msize), (uintptr_t)tiny_mag_ptr, cleared_requested);
@@ -2439,7 +2426,7 @@
SZONE_MAGAZINE_PTR_UNLOCK(tiny_mag_ptr);
CHECK(szone, __PRETTY_FUNCTION__);
- tiny_check_zero_and_clear(ptr, msize, cleared_requested);
+ tiny_check_zero_or_clear(ptr, msize, cleared_requested);
#if DEBUG_MALLOC
if (LOG(szone, ptr)) {
@@ -2455,7 +2442,7 @@
if (ptr) {
SZONE_MAGAZINE_PTR_UNLOCK(tiny_mag_ptr);
CHECK(szone, __PRETTY_FUNCTION__);
- tiny_check_zero_and_clear(ptr, msize, cleared_requested);
+ tiny_check_zero_or_clear(ptr, msize, cleared_requested);
return ptr;
}
@@ -2465,7 +2452,7 @@
if (ptr) {
SZONE_MAGAZINE_PTR_UNLOCK(tiny_mag_ptr);
CHECK(szone, __PRETTY_FUNCTION__);
- tiny_check_zero_and_clear(ptr, msize, cleared_requested);
+ tiny_check_zero_or_clear(ptr, msize, cleared_requested);
return ptr;
}
}
@@ -2595,7 +2582,7 @@
}
#endif
- if (malloc_zero_on_free) {
+ if (malloc_zero_policy == MALLOC_ZERO_ON_FREE) {
memset(ptr, '\0', TINY_BYTES_FOR_MSIZE(msize));
}
@@ -2616,7 +2603,7 @@
return;
}
- if (!malloc_zero_on_free) {
+ if (malloc_zero_policy != MALLOC_ZERO_ON_FREE) {
if ((rack->debug_flags & MALLOC_DO_SCRIBBLE) && msize) {
memset(ptr, SCRABBLE_BYTE, TINY_BYTES_FOR_MSIZE(msize));
}
@@ -2671,7 +2658,8 @@
{
msize_t msize = TINY_MSIZE_FOR_BYTES(size + TINY_QUANTUM - 1);
unsigned found = 0;
- mag_index_t mag_index = tiny_mag_get_thread_index() % szone->tiny_rack.num_magazines;
+
+ mag_index_t mag_index = rack_get_thread_index(&szone->tiny_rack) % szone->tiny_rack.num_magazines;
magazine_t *tiny_mag_ptr = &(szone->tiny_rack.magazines[mag_index]);
// make sure to return objects at least one quantum in size
@@ -2746,7 +2734,7 @@
if (is_free) {
break; // a double free; let the standard free deal with it
}
- if (malloc_zero_on_free) {
+ if (malloc_zero_policy == MALLOC_ZERO_ON_FREE) {
memset(ptr, '\0', TINY_BYTES_FOR_MSIZE(msize));
}
if (!tiny_free_no_lock(&szone->tiny_rack, tiny_mag_ptr, mag_index, tiny_region, ptr, msize, 0)) {