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

extent_may_dalloc -> ehooks_dalloc_will_fail

Browse Source
This commit is contained in:
David Goldblatt
2019-12-11 13:35:43 -08:00
committed by David Goldblatt
parent 7859184179
commit 09475bf8ac
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/extent2.c
View File

@@ -1243,12 +1243,6 @@ extent_dalloc_gap(tsdn_t *tsdn, arena_t *arena, edata_t *edata) {
extent_dalloc_wrapper(tsdn, arena, ehooks, edata);
}
static bool
extent_may_dalloc(void) {
/* With retain enabled, the default dalloc always fails. */
return !opt_retain;
}
static bool
extent_dalloc_wrapper_try(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
edata_t *edata) {
@@ -1281,7 +1275,7 @@ extent_dalloc_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
WITNESS_RANK_CORE, 0);
/* Avoid calling the default extent_dalloc unless have to. */
if (!ehooks_are_default(ehooks) || extent_may_dalloc()) {
if (!ehooks_dalloc_will_fail(ehooks)) {
/*
* Deregister first to avoid a race with other allocating
* threads, and reregister if deallocation fails.