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

Unify arena flag reading and selection

Browse Source
This commit is contained in:
Yinan Zhang 2020-05-13 14:49:41 -07:00
parent e128b170a0
commit 24bbf376ce
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/jemalloc.c
View File

@ -2144,31 +2144,38 @@ tcache_get_from_ind(tsd_t *tsd, unsigned tcache_ind, bool slow, bool is_alloc) {
return tcache; return tcache;
} }
/* ind is ignored if dopts->alignment > 0. */ /* Return true if a manual arena is specified and arena_get() OOMs. */
JEMALLOC_ALWAYS_INLINE void * JEMALLOC_ALWAYS_INLINE bool
imalloc_no_sample(static_opts_t *sopts, dynamic_opts_t *dopts, tsd_t *tsd, arena_get_from_ind(tsd_t *tsd, unsigned arena_ind, arena_t **arena_p) {
size_t size, size_t usize, szind_t ind) { if (arena_ind == ARENA_IND_AUTOMATIC) {
arena_t *arena;
/* Fill in the tcache. */
tcache_t *tcache = tcache_get_from_ind(tsd, dopts->tcache_ind,
sopts->slow, /* is_alloc */ true);
/* Fill in the arena. */
if (dopts->arena_ind == ARENA_IND_AUTOMATIC) {
/* /*
* In case of automatic arena management, we defer arena * In case of automatic arena management, we defer arena
* computation until as late as we can, hoping to fill the * computation until as late as we can, hoping to fill the
* allocation out of the tcache. * allocation out of the tcache.
*/ */
arena = NULL; *arena_p = NULL;
} else { } else {
arena = arena_get(tsd_tsdn(tsd), dopts->arena_ind, true); *arena_p = arena_get(tsd_tsdn(tsd), arena_ind, true);
if (unlikely(arena == NULL) && if (unlikely(*arena_p == NULL) && arena_ind >= narenas_auto) {
dopts->arena_ind >= narenas_auto) { return true;
return NULL;
} }
} }
return false;
}
/* ind is ignored if dopts->alignment > 0. */
JEMALLOC_ALWAYS_INLINE void *
imalloc_no_sample(static_opts_t *sopts, dynamic_opts_t *dopts, tsd_t *tsd,
size_t size, size_t usize, szind_t ind) {
/* Fill in the tcache. */
tcache_t *tcache = tcache_get_from_ind(tsd, dopts->tcache_ind,
sopts->slow, /* is_alloc */ true);
/* Fill in the arena. */
arena_t *arena;
if (arena_get_from_ind(tsd, dopts->arena_ind, &arena)) {
return NULL;
}
if (unlikely(dopts->alignment != 0)) { if (unlikely(dopts->alignment != 0)) {
return ipalloct(tsd_tsdn(tsd), usize, dopts->alignment, return ipalloct(tsd_tsdn(tsd), usize, dopts->alignment,
@ -3121,6 +3128,15 @@ mallocx_tcache_get(int flags) {
} }
} }
JEMALLOC_ALWAYS_INLINE unsigned
mallocx_arena_get(int flags) {
if (unlikely((flags & MALLOCX_ARENA_MASK) != 0)) {
return MALLOCX_ARENA_GET(flags);
} else {
return ARENA_IND_AUTOMATIC;
}
}
#ifdef JEMALLOC_EXPERIMENTAL_SMALLOCX_API #ifdef JEMALLOC_EXPERIMENTAL_SMALLOCX_API
#define JEMALLOC_SMALLOCX_CONCAT_HELPER(x, y) x ## y #define JEMALLOC_SMALLOCX_CONCAT_HELPER(x, y) x ## y
@ -3166,13 +3182,9 @@ JEMALLOC_SMALLOCX_CONCAT_HELPER2(je_smallocx_, JEMALLOC_VERSION_GID_IDENT)
dopts.item_size = size; dopts.item_size = size;
if (unlikely(flags != 0)) { if (unlikely(flags != 0)) {
dopts.alignment = MALLOCX_ALIGN_GET(flags); dopts.alignment = MALLOCX_ALIGN_GET(flags);
dopts.zero = MALLOCX_ZERO_GET(flags); dopts.zero = MALLOCX_ZERO_GET(flags);
dopts.tcache_ind = mallocx_tcache_get(flags); dopts.tcache_ind = mallocx_tcache_get(flags);
dopts.arena_ind = mallocx_arena_get(flags);
if ((flags & MALLOCX_ARENA_MASK) != 0)
dopts.arena_ind = MALLOCX_ARENA_GET(flags);
} }
imalloc(&sopts, &dopts); imalloc(&sopts, &dopts);
@ -3208,13 +3220,9 @@ je_mallocx(size_t size, int flags) {
dopts.item_size = size; dopts.item_size = size;
if (unlikely(flags != 0)) { if (unlikely(flags != 0)) {
dopts.alignment = MALLOCX_ALIGN_GET(flags); dopts.alignment = MALLOCX_ALIGN_GET(flags);
dopts.zero = MALLOCX_ZERO_GET(flags); dopts.zero = MALLOCX_ZERO_GET(flags);
dopts.tcache_ind = mallocx_tcache_get(flags); dopts.tcache_ind = mallocx_tcache_get(flags);
dopts.arena_ind = mallocx_arena_get(flags);
if ((flags & MALLOCX_ARENA_MASK) != 0)
dopts.arena_ind = MALLOCX_ARENA_GET(flags);
} }
imalloc(&sopts, &dopts); imalloc(&sopts, &dopts);
@ -3316,15 +3324,10 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) {
bool zero = zero_get(MALLOCX_ZERO_GET(flags), /* slow */ true); bool zero = zero_get(MALLOCX_ZERO_GET(flags), /* slow */ true);
if (unlikely((flags & MALLOCX_ARENA_MASK) != 0)) { unsigned arena_ind = mallocx_arena_get(flags);
unsigned arena_ind = MALLOCX_ARENA_GET(flags); if (arena_get_from_ind(tsd, arena_ind, &arena)) {
arena = arena_get(tsd_tsdn(tsd), arena_ind, true);
if (unlikely(arena == NULL) && arena_ind >= narenas_auto) {
goto label_oom; goto label_oom;
} }
} else {
arena = NULL;
}
unsigned tcache_ind = mallocx_tcache_get(flags); unsigned tcache_ind = mallocx_tcache_get(flags);
tcache_t *tcache = tcache_get_from_ind(tsd, tcache_ind, tcache_t *tcache = tcache_get_from_ind(tsd, tcache_ind,