diff options
Diffstat (limited to 'deps/jemalloc/src/extent.c')
-rw-r--r-- | deps/jemalloc/src/extent.c | 70 |
1 files changed, 23 insertions, 47 deletions
diff --git a/deps/jemalloc/src/extent.c b/deps/jemalloc/src/extent.c index 218156c60..13f94411c 100644 --- a/deps/jemalloc/src/extent.c +++ b/deps/jemalloc/src/extent.c @@ -3,48 +3,45 @@ /******************************************************************************/ -/* - * Round down to the nearest chunk size that can actually be requested during - * normal huge allocation. - */ JEMALLOC_INLINE_C size_t extent_quantize(size_t size) { - size_t ret; - szind_t ind; - assert(size > 0); - - ind = size2index(size + 1); - if (ind == 0) { - /* Avoid underflow. */ - return (index2size(0)); - } - ret = index2size(ind - 1); - assert(ret <= size); - return (ret); + /* + * Round down to the nearest chunk size that can actually be requested + * during normal huge allocation. + */ + return (index2size(size2index(size + 1) - 1)); } JEMALLOC_INLINE_C int -extent_sz_comp(const extent_node_t *a, const extent_node_t *b) +extent_szad_comp(extent_node_t *a, extent_node_t *b) { + int ret; size_t a_qsize = extent_quantize(extent_node_size_get(a)); size_t b_qsize = extent_quantize(extent_node_size_get(b)); - return ((a_qsize > b_qsize) - (a_qsize < b_qsize)); -} + /* + * Compare based on quantized size rather than size, in order to sort + * equally useful extents only by address. + */ + ret = (a_qsize > b_qsize) - (a_qsize < b_qsize); + if (ret == 0) { + uintptr_t a_addr = (uintptr_t)extent_node_addr_get(a); + uintptr_t b_addr = (uintptr_t)extent_node_addr_get(b); -JEMALLOC_INLINE_C int -extent_sn_comp(const extent_node_t *a, const extent_node_t *b) -{ - size_t a_sn = extent_node_sn_get(a); - size_t b_sn = extent_node_sn_get(b); + ret = (a_addr > b_addr) - (a_addr < b_addr); + } - return ((a_sn > b_sn) - (a_sn < b_sn)); + return (ret); } +/* Generate red-black tree functions. */ +rb_gen(, extent_tree_szad_, extent_tree_t, extent_node_t, szad_link, + extent_szad_comp) + JEMALLOC_INLINE_C int -extent_ad_comp(const extent_node_t *a, const extent_node_t *b) +extent_ad_comp(extent_node_t *a, extent_node_t *b) { uintptr_t a_addr = (uintptr_t)extent_node_addr_get(a); uintptr_t b_addr = (uintptr_t)extent_node_addr_get(b); @@ -52,26 +49,5 @@ extent_ad_comp(const extent_node_t *a, const extent_node_t *b) return ((a_addr > b_addr) - (a_addr < b_addr)); } -JEMALLOC_INLINE_C int -extent_szsnad_comp(const extent_node_t *a, const extent_node_t *b) -{ - int ret; - - ret = extent_sz_comp(a, b); - if (ret != 0) - return (ret); - - ret = extent_sn_comp(a, b); - if (ret != 0) - return (ret); - - ret = extent_ad_comp(a, b); - return (ret); -} - -/* Generate red-black tree functions. */ -rb_gen(, extent_tree_szsnad_, extent_tree_t, extent_node_t, szsnad_link, - extent_szsnad_comp) - /* Generate red-black tree functions. */ rb_gen(, extent_tree_ad_, extent_tree_t, extent_node_t, ad_link, extent_ad_comp) |