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

Base: Remove some unnecessary reentrancy guards.

Browse Source 
The ehooks module will now call these if necessary.
This commit is contained in:
David Goldblatt 2019-12-04 14:05:14 -08:00 committed by David Goldblatt
parent 403f2d1664
commit ebbb973271
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/base.c
View File

@ -79,25 +79,21 @@ base_unmap(tsdn_t *tsdn, ehooks_t *ehooks, unsigned ind, void *addr,
/* Nothing worked. This should never happen. */ /* Nothing worked. This should never happen. */
not_reached(); not_reached();
} else { } else {
tsd_t *tsd = tsdn_null(tsdn) ? tsd_fetch() : tsdn_tsd(tsdn);
pre_reentrancy(tsd, NULL);
if (!ehooks_dalloc(tsdn, ehooks, addr, size, true, ind)) { if (!ehooks_dalloc(tsdn, ehooks, addr, size, true, ind)) {
goto label_post_reentrancy; goto label_done;
} }
if (!ehooks_decommit(tsdn, ehooks, addr, size, 0, size, ind)) { if (!ehooks_decommit(tsdn, ehooks, addr, size, 0, size, ind)) {
goto label_post_reentrancy; goto label_done;
} }
if (!ehooks_purge_forced(tsdn, ehooks, addr, size, 0, size, if (!ehooks_purge_forced(tsdn, ehooks, addr, size, 0, size,
ind)) { ind)) {
goto label_post_reentrancy; goto label_done;
} }
if (!ehooks_purge_lazy(tsdn, ehooks, addr, size, 0, size, if (!ehooks_purge_lazy(tsdn, ehooks, addr, size, 0, size,
ind)) { ind)) {
goto label_post_reentrancy; goto label_done;
} }
/* Nothing worked. That's the application's problem. */ /* Nothing worked. That's the application's problem. */
label_post_reentrancy:
post_reentrancy(tsd);
} }
label_done: label_done:
if (metadata_thp_madvise()) { if (metadata_thp_madvise()) {