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

Unify zero flag reading and setting

Browse Source
This commit is contained in:
Yinan Zhang 2020-05-13 11:19:09 -07:00
parent 2a84f9b8fc
commit 4b0c008489
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jemalloc.c
View File

@ -2105,6 +2105,15 @@ aligned_usize_get(size_t size, size_t alignment, size_t *usize, szind_t *ind,
return false; return false;
} }
JEMALLOC_ALWAYS_INLINE bool
zero_get(bool guarantee, bool slow) {
if (config_fill && slow && unlikely(opt_zero)) {
return true;
} else {
return guarantee;
}
}
/* ind is ignored if dopts->alignment > 0. */ /* ind is ignored if dopts->alignment > 0. */
JEMALLOC_ALWAYS_INLINE void * JEMALLOC_ALWAYS_INLINE void *
imalloc_no_sample(static_opts_t *sopts, dynamic_opts_t *dopts, tsd_t *tsd, imalloc_no_sample(static_opts_t *sopts, dynamic_opts_t *dopts, tsd_t *tsd,
@ -2255,9 +2264,7 @@ imalloc_body(static_opts_t *sopts, dynamic_opts_t *dopts, tsd_t *tsd) {
} }
/* This is the beginning of the "core" algorithm. */ /* This is the beginning of the "core" algorithm. */
if (config_fill && sopts->slow && opt_zero) { dopts->zero = zero_get(dopts->zero, sopts->slow);
dopts->zero = true;
}
if (aligned_usize_get(size, dopts->alignment, &usize, &ind, if (aligned_usize_get(size, dopts->alignment, &usize, &ind,
sopts->bump_empty_aligned_alloc)) { sopts->bump_empty_aligned_alloc)) {
goto label_oom; goto label_oom;
@ -3293,10 +3300,7 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) {
tsd = tsd_fetch(); tsd = tsd_fetch();
check_entry_exit_locking(tsd_tsdn(tsd)); check_entry_exit_locking(tsd_tsdn(tsd));
bool zero = flags & MALLOCX_ZERO; bool zero = zero_get(MALLOCX_ZERO_GET(flags), /* slow */ true);
if (config_fill && unlikely(opt_zero)) {
zero = true;
}
if (unlikely((flags & MALLOCX_ARENA_MASK) != 0)) { if (unlikely((flags & MALLOCX_ARENA_MASK) != 0)) {
unsigned arena_ind = MALLOCX_ARENA_GET(flags); unsigned arena_ind = MALLOCX_ARENA_GET(flags);
@ -3562,11 +3566,7 @@ je_xallocx(void *ptr, size_t size, size_t extra, int flags) {
tsd_t *tsd; tsd_t *tsd;
size_t usize, old_usize; size_t usize, old_usize;
size_t alignment = MALLOCX_ALIGN_GET(flags); size_t alignment = MALLOCX_ALIGN_GET(flags);
bool zero = zero_get(MALLOCX_ZERO_GET(flags), /* slow */ true);
bool zero = flags & MALLOCX_ZERO;
if (config_fill && unlikely(opt_zero)) {
zero = true;
}
LOG("core.xallocx.entry", "ptr: %p, size: %zu, extra: %zu, " LOG("core.xallocx.entry", "ptr: %p, size: %zu, extra: %zu, "
"flags: %d", ptr, size, extra, flags); "flags: %d", ptr, size, extra, flags);