project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rtree: Pull leaf contents into their own struct.

Browse Source
This commit is contained in:
David Goldblatt 2020-03-13 11:47:51 -07:00 committed by David Goldblatt
parent faec7219b2
commit bd4fdf295e
4 changed files with 110 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/jemalloc/internal/edata.h
View File

@ -39,6 +39,23 @@ struct e_prof_info_s {
}; };
typedef struct e_prof_info_s e_prof_info_t; typedef struct e_prof_info_s e_prof_info_t;
/*
* The information about a particular edata that lives in an emap. Space is
* more previous there (the information, plus the edata pointer, has to live in
* a 64-bit word if we want to enable a packed representation.
*
* There are two things that are special about the information here:
* - It's quicker to access. You have one fewer pointer hop, since finding the
* edata_t associated with an item always requires accessing the rtree leaf in
* which this data is stored.
* - It can be read unsynchronized, and without worrying about lifetime issues.
*/
typedef struct edata_map_info_s edata_map_info_t;
struct edata_map_info_s {
bool slab;
szind_t szind;
};
/* Extent (span of pages). Use accessor functions for e_* fields. */ /* Extent (span of pages). Use accessor functions for e_* fields. */
typedef struct edata_s edata_t; typedef struct edata_s edata_t;
typedef ql_head(edata_t) edata_list_t; typedef ql_head(edata_t) edata_list_t;

118
include/jemalloc/internal/rtree.h
View File

@ -43,6 +43,13 @@ struct rtree_node_elm_s {
atomic_p_t child; /* (rtree_{node,leaf}_elm_t *) */ atomic_p_t child; /* (rtree_{node,leaf}_elm_t *) */
}; };
typedef struct rtree_leaf_elm_contents_s rtree_leaf_elm_contents_t;
struct rtree_leaf_elm_contents_s {
edata_t *edata;
szind_t szind;
bool slab;
};
struct rtree_leaf_elm_s { struct rtree_leaf_elm_s {
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
/* /*
@ -163,43 +170,53 @@ rtree_leaf_elm_bits_read(tsdn_t *tsdn, rtree_t *rtree,
? ATOMIC_RELAXED : ATOMIC_ACQUIRE); ? ATOMIC_RELAXED : ATOMIC_ACQUIRE);
} }
JEMALLOC_ALWAYS_INLINE edata_t * JEMALLOC_ALWAYS_INLINE uintptr_t
rtree_leaf_elm_bits_edata_get(uintptr_t bits) { rtree_leaf_elm_bits_encode(rtree_leaf_elm_contents_t contents) {
uintptr_t edata_bits = (uintptr_t)contents.edata
& (((uintptr_t)1 << LG_VADDR) - 1);
uintptr_t szind_bits = (uintptr_t)contents.szind << LG_VADDR;
/*
* Slab shares the low bit of edata; we know edata is on an even address
* (in fact, it's 128 bytes on 64-bit systems; we can enforce this
* alignment if we want to steal 6 extra rtree leaf bits someday.
*/
uintptr_t slab_bits = (uintptr_t)contents.slab;
return szind_bits | edata_bits | slab_bits;
}
JEMALLOC_ALWAYS_INLINE rtree_leaf_elm_contents_t
rtree_leaf_elm_bits_decode(uintptr_t bits) {
rtree_leaf_elm_contents_t contents;
/* Do the easy things first. */
contents.szind = bits >> LG_VADDR;
contents.slab = (bool)(bits & 1);
# ifdef __aarch64__ # ifdef __aarch64__
/* /*
* aarch64 doesn't sign extend the highest virtual address bit to set * aarch64 doesn't sign extend the highest virtual address bit to set
* the higher ones. Instead, the high bits gets zeroed. * the higher ones. Instead, the high bits get zeroed.
*/ */
uintptr_t high_bit_mask = ((uintptr_t)1 << LG_VADDR) - 1; uintptr_t high_bit_mask = ((uintptr_t)1 << LG_VADDR) - 1;
/* Mask off the slab bit. */ /* Mask off the slab bit. */
uintptr_t low_bit_mask = ~(uintptr_t)1; uintptr_t low_bit_mask = ~(uintptr_t)1;
uintptr_t mask = high_bit_mask & low_bit_mask; uintptr_t mask = high_bit_mask & low_bit_mask;
return (edata_t *)(bits & mask); contents.edata = (edata_t *)(bits & mask);
# else # else
/* Restore sign-extended high bits, mask slab bit. */ /* Restore sign-extended high bits, mask slab bit. */
return (edata_t *)((uintptr_t)((intptr_t)(bits << RTREE_NHIB) >> contents.edata = (edata_t *)((uintptr_t)((intptr_t)(bits << RTREE_NHIB)
RTREE_NHIB) & ~((uintptr_t)0x1)); >> RTREE_NHIB) & ~((uintptr_t)0x1));
# endif # endif
return contents;
} }
JEMALLOC_ALWAYS_INLINE szind_t # endif /* RTREE_LEAF_COMPACT */
rtree_leaf_elm_bits_szind_get(uintptr_t bits) {
return (szind_t)(bits >> LG_VADDR);
}
JEMALLOC_ALWAYS_INLINE bool
rtree_leaf_elm_bits_slab_get(uintptr_t bits) {
return (bool)(bits & (uintptr_t)0x1);
}
# endif
JEMALLOC_ALWAYS_INLINE edata_t * JEMALLOC_ALWAYS_INLINE edata_t *
rtree_leaf_elm_edata_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_edata_read(tsdn_t *tsdn, rtree_t *rtree,
rtree_leaf_elm_t *elm, bool dependent) { rtree_leaf_elm_t *elm, bool dependent) {
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent); uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
return rtree_leaf_elm_bits_edata_get(bits); rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(bits);
return contents.edata;
#else #else
edata_t *edata = (edata_t *)atomic_load_p(&elm->le_edata, dependent edata_t *edata = (edata_t *)atomic_load_p(&elm->le_edata, dependent
? ATOMIC_RELAXED : ATOMIC_ACQUIRE); ? ATOMIC_RELAXED : ATOMIC_ACQUIRE);
@ -212,7 +229,8 @@ rtree_leaf_elm_szind_read(tsdn_t *tsdn, rtree_t *rtree,
rtree_leaf_elm_t *elm, bool dependent) { rtree_leaf_elm_t *elm, bool dependent) {
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent); uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
return rtree_leaf_elm_bits_szind_get(bits); rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(bits);
return contents.szind;
#else #else
return (szind_t)atomic_load_u(&elm->le_szind, dependent ? ATOMIC_RELAXED return (szind_t)atomic_load_u(&elm->le_szind, dependent ? ATOMIC_RELAXED
: ATOMIC_ACQUIRE); : ATOMIC_ACQUIRE);
@ -224,7 +242,8 @@ rtree_leaf_elm_slab_read(tsdn_t *tsdn, rtree_t *rtree,
rtree_leaf_elm_t *elm, bool dependent) { rtree_leaf_elm_t *elm, bool dependent) {
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent); uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
return rtree_leaf_elm_bits_slab_get(bits); rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(bits);
return contents.slab;
#else #else
return atomic_load_b(&elm->le_slab, dependent ? ATOMIC_RELAXED : return atomic_load_b(&elm->le_slab, dependent ? ATOMIC_RELAXED :
ATOMIC_ACQUIRE); ATOMIC_ACQUIRE);
@ -236,9 +255,10 @@ rtree_leaf_elm_edata_write(tsdn_t *tsdn, rtree_t *rtree,
rtree_leaf_elm_t *elm, edata_t *edata) { rtree_leaf_elm_t *elm, edata_t *edata) {
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, true); uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, true);
uintptr_t bits = ((uintptr_t)rtree_leaf_elm_bits_szind_get(old_bits) << rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(
LG_VADDR) | ((uintptr_t)edata & (((uintptr_t)0x1 << LG_VADDR) - 1)) old_bits);
| ((uintptr_t)rtree_leaf_elm_bits_slab_get(old_bits)); contents.edata = edata;
uintptr_t bits = rtree_leaf_elm_bits_encode(contents);
atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE); atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE);
#else #else
atomic_store_p(&elm->le_edata, edata, ATOMIC_RELEASE); atomic_store_p(&elm->le_edata, edata, ATOMIC_RELEASE);
@ -253,10 +273,10 @@ rtree_leaf_elm_szind_write(tsdn_t *tsdn, rtree_t *rtree,
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm,
true); true);
uintptr_t bits = ((uintptr_t)szind << LG_VADDR) | rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(
((uintptr_t)rtree_leaf_elm_bits_edata_get(old_bits) & old_bits);
(((uintptr_t)0x1 << LG_VADDR) - 1)) | contents.szind = szind;
((uintptr_t)rtree_leaf_elm_bits_slab_get(old_bits)); uintptr_t bits = rtree_leaf_elm_bits_encode(contents);
atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE); atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE);
#else #else
atomic_store_u(&elm->le_szind, szind, ATOMIC_RELEASE); atomic_store_u(&elm->le_szind, szind, ATOMIC_RELEASE);
@ -269,9 +289,10 @@ rtree_leaf_elm_slab_write(tsdn_t *tsdn, rtree_t *rtree,
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, uintptr_t old_bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm,
true); true);
uintptr_t bits = ((uintptr_t)rtree_leaf_elm_bits_szind_get(old_bits) << rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(
LG_VADDR) | ((uintptr_t)rtree_leaf_elm_bits_edata_get(old_bits) & old_bits);
(((uintptr_t)0x1 << LG_VADDR) - 1)) | ((uintptr_t)slab); contents.slab = slab;
uintptr_t bits = rtree_leaf_elm_bits_encode(contents);
atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE); atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE);
#else #else
atomic_store_b(&elm->le_slab, slab, ATOMIC_RELEASE); atomic_store_b(&elm->le_slab, slab, ATOMIC_RELEASE);
@ -280,11 +301,9 @@ rtree_leaf_elm_slab_write(tsdn_t *tsdn, rtree_t *rtree,
static inline void static inline void
rtree_leaf_elm_write(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_write(tsdn_t *tsdn, rtree_t *rtree,
rtree_leaf_elm_t *elm, edata_t *edata, szind_t szind, bool slab) { rtree_leaf_elm_t *elm, rtree_leaf_elm_contents_t contents) {
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = ((uintptr_t)szind << LG_VADDR) | uintptr_t bits = rtree_leaf_elm_bits_encode(contents);
((uintptr_t)edata & (((uintptr_t)0x1 << LG_VADDR) - 1)) |
((uintptr_t)slab);
atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE); atomic_store_p(&elm->le_bits, (void *)bits, ATOMIC_RELEASE);
#else #else
rtree_leaf_elm_slab_write(tsdn, rtree, elm, slab); rtree_leaf_elm_slab_write(tsdn, rtree, elm, slab);
@ -382,7 +401,11 @@ rtree_write(tsdn_t *tsdn, rtree_t *rtree, rtree_ctx_t *rtree_ctx, uintptr_t key,
} }
assert(rtree_leaf_elm_edata_read(tsdn, rtree, elm, false) == NULL); assert(rtree_leaf_elm_edata_read(tsdn, rtree, elm, false) == NULL);
rtree_leaf_elm_write(tsdn, rtree, elm, edata, szind, slab); rtree_leaf_elm_contents_t contents;
contents.edata = edata;
contents.szind = szind;
contents.slab = slab;
rtree_leaf_elm_write(tsdn, rtree, elm, contents);
return false; return false;
} }
@ -437,9 +460,11 @@ rtree_edata_szind_slab_read(tsdn_t *tsdn, rtree_t *rtree,
} }
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent); uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
*r_edata = rtree_leaf_elm_bits_edata_get(bits); rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(bits);
*r_szind = rtree_leaf_elm_bits_szind_get(bits);
*r_slab = rtree_leaf_elm_bits_slab_get(bits); *r_edata = contents.edata;
*r_szind = contents.szind;
*r_slab = contents.slab;
#else #else
*r_edata = rtree_leaf_elm_edata_read(tsdn, rtree, elm, dependent); *r_edata = rtree_leaf_elm_edata_read(tsdn, rtree, elm, dependent);
*r_szind = rtree_leaf_elm_szind_read(tsdn, rtree, elm, dependent); *r_szind = rtree_leaf_elm_szind_read(tsdn, rtree, elm, dependent);
@ -473,8 +498,10 @@ rtree_szind_slab_read_fast(tsdn_t *tsdn, rtree_t *rtree, rtree_ctx_t *rtree_ctx,
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree,
elm, true); elm, true);
*r_szind = rtree_leaf_elm_bits_szind_get(bits); rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(
*r_slab = rtree_leaf_elm_bits_slab_get(bits); bits);
*r_szind = contents.szind;
*r_slab = contents.slab;
#else #else
*r_szind = rtree_leaf_elm_szind_read(tsdn, rtree, elm, true); *r_szind = rtree_leaf_elm_szind_read(tsdn, rtree, elm, true);
*r_slab = rtree_leaf_elm_slab_read(tsdn, rtree, elm, true); *r_slab = rtree_leaf_elm_slab_read(tsdn, rtree, elm, true);
@ -494,8 +521,9 @@ rtree_szind_slab_read(tsdn_t *tsdn, rtree_t *rtree, rtree_ctx_t *rtree_ctx,
} }
#ifdef RTREE_LEAF_COMPACT #ifdef RTREE_LEAF_COMPACT
uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent); uintptr_t bits = rtree_leaf_elm_bits_read(tsdn, rtree, elm, dependent);
*r_szind = rtree_leaf_elm_bits_szind_get(bits); rtree_leaf_elm_contents_t contents = rtree_leaf_elm_bits_decode(bits);
*r_slab = rtree_leaf_elm_bits_slab_get(bits); *r_szind = contents.szind;
*r_slab = contents.slab;
#else #else
*r_szind = rtree_leaf_elm_szind_read(tsdn, rtree, elm, dependent); *r_szind = rtree_leaf_elm_szind_read(tsdn, rtree, elm, dependent);
*r_slab = rtree_leaf_elm_slab_read(tsdn, rtree, elm, dependent); *r_slab = rtree_leaf_elm_slab_read(tsdn, rtree, elm, dependent);
@ -518,7 +546,11 @@ rtree_clear(tsdn_t *tsdn, rtree_t *rtree, rtree_ctx_t *rtree_ctx,
rtree_leaf_elm_t *elm = rtree_read(tsdn, rtree, rtree_ctx, key, true); rtree_leaf_elm_t *elm = rtree_read(tsdn, rtree, rtree_ctx, key, true);
assert(rtree_leaf_elm_edata_read(tsdn, rtree, elm, false) != assert(rtree_leaf_elm_edata_read(tsdn, rtree, elm, false) !=
NULL); NULL);
rtree_leaf_elm_write(tsdn, rtree, elm, NULL, SC_NSIZES, false); rtree_leaf_elm_contents_t contents;
contents.edata = NULL;
contents.szind = SC_NSIZES;
contents.slab = false;
rtree_leaf_elm_write(tsdn, rtree, elm, contents);
} }
#endif /* JEMALLOC_INTERNAL_RTREE_H */ #endif /* JEMALLOC_INTERNAL_RTREE_H */

18
src/emap.c
View File

@ -139,10 +139,13 @@ emap_rtree_leaf_elms_lookup(tsdn_t *tsdn, emap_t *emap, rtree_ctx_t *rtree_ctx,
static void static void
emap_rtree_write_acquired(tsdn_t *tsdn, emap_t *emap, rtree_leaf_elm_t *elm_a, emap_rtree_write_acquired(tsdn_t *tsdn, emap_t *emap, rtree_leaf_elm_t *elm_a,
rtree_leaf_elm_t *elm_b, edata_t *edata, szind_t szind, bool slab) { rtree_leaf_elm_t *elm_b, edata_t *edata, szind_t szind, bool slab) {
rtree_leaf_elm_write(tsdn, &emap->rtree, elm_a, edata, szind, slab); rtree_leaf_elm_contents_t contents;
contents.edata = edata;
contents.szind = szind;
contents.slab = slab;
rtree_leaf_elm_write(tsdn, &emap->rtree, elm_a, contents);
if (elm_b != NULL) { if (elm_b != NULL) {
rtree_leaf_elm_write(tsdn, &emap->rtree, elm_b, edata, szind, rtree_leaf_elm_write(tsdn, &emap->rtree, elm_b, contents);
slab);
} }
} }
@ -292,15 +295,20 @@ emap_merge_prepare(tsdn_t *tsdn, emap_t *emap, emap_prepare_t *prepare,
void void
emap_merge_commit(tsdn_t *tsdn, emap_t *emap, emap_prepare_t *prepare, emap_merge_commit(tsdn_t *tsdn, emap_t *emap, emap_prepare_t *prepare,
edata_t *lead, edata_t *trail) { edata_t *lead, edata_t *trail) {
rtree_leaf_elm_contents_t clear_contents;
clear_contents.edata = NULL;
clear_contents.szind = SC_NSIZES;
clear_contents.slab = false;
if (prepare->lead_elm_b != NULL) { if (prepare->lead_elm_b != NULL) {
rtree_leaf_elm_write(tsdn, &emap->rtree, rtree_leaf_elm_write(tsdn, &emap->rtree,
prepare->lead_elm_b, NULL, SC_NSIZES, false); prepare->lead_elm_b, clear_contents);
} }
rtree_leaf_elm_t *merged_b; rtree_leaf_elm_t *merged_b;
if (prepare->trail_elm_b != NULL) { if (prepare->trail_elm_b != NULL) {
rtree_leaf_elm_write(tsdn, &emap->rtree, rtree_leaf_elm_write(tsdn, &emap->rtree,
prepare->trail_elm_a, NULL, SC_NSIZES, false); prepare->trail_elm_a, clear_contents);
merged_b = prepare->trail_elm_b; merged_b = prepare->trail_elm_b;
} else { } else {
merged_b = prepare->trail_elm_a; merged_b = prepare->trail_elm_a;

7
test/unit/rtree.c
View File

@ -137,8 +137,11 @@ TEST_BEGIN(test_rtree_random) {
&rtree_ctx, keys[i], false, true); &rtree_ctx, keys[i], false, true);
expect_ptr_not_null(elm, expect_ptr_not_null(elm,
"Unexpected rtree_leaf_elm_lookup() failure"); "Unexpected rtree_leaf_elm_lookup() failure");
rtree_leaf_elm_write(tsdn, rtree, elm, &edata, SC_NSIZES, rtree_leaf_elm_contents_t contents;
false); contents.edata = &edata;
contents.szind = SC_NSIZES;
contents.slab = false;
rtree_leaf_elm_write(tsdn, rtree, elm, contents);
expect_ptr_eq(rtree_edata_read(tsdn, rtree, &rtree_ctx, expect_ptr_eq(rtree_edata_read(tsdn, rtree, &rtree_ctx,
keys[i], true), &edata, keys[i], true), &edata,
"rtree_edata_read() should return previously set value"); "rtree_edata_read() should return previously set value");