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

Move bg thread activity check out of purging core.

Browse Source
This commit is contained in:
David Goldblatt 2020-03-11 13:12:12 -07:00 committed by David Goldblatt
parent 3034f4a508
commit 103f5feda5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/arena.c
View File

@ -641,8 +641,6 @@ arena_decay_to_limit(tsdn_t *tsdn, arena_t *arena, decay_t *decay,
&decay_extents); &decay_extents);
assert(npurged == npurge); assert(npurged == npurge);
} }
arena_background_thread_inactivity_check(tsdn, arena,
is_background_thread);
malloc_mutex_lock(tsdn, &decay->mtx); malloc_mutex_lock(tsdn, &decay->mtx);
decay->purging = false; decay->purging = false;
@ -653,10 +651,25 @@ arena_decay_impl(tsdn_t *tsdn, arena_t *arena, decay_t *decay,
pa_shard_decay_stats_t *decay_stats, ecache_t *ecache, pa_shard_decay_stats_t *decay_stats, ecache_t *ecache,
bool is_background_thread, bool all) { bool is_background_thread, bool all) {
if (all) { if (all) {
assert(!is_background_thread);
malloc_mutex_lock(tsdn, &decay->mtx); malloc_mutex_lock(tsdn, &decay->mtx);
arena_decay_to_limit(tsdn, arena, decay, decay_stats, ecache, arena_decay_to_limit(tsdn, arena, decay, decay_stats, ecache,
all, 0, ecache_npages_get(ecache), is_background_thread); all, 0, ecache_npages_get(ecache), is_background_thread);
malloc_mutex_unlock(tsdn, &decay->mtx); malloc_mutex_unlock(tsdn, &decay->mtx);
/*
* The previous pa_decay_to_limit call may not have actually
* decayed all pages, if new pages were added concurrently with
* the purge.
*
* I don't think we need an activity check for that case (some
* other thread must be deallocating, and they should do one),
* but we do one anyways. This line comes out of a refactoring
* diff in which the check was pulled out of the callee, and so
* an extra redundant check minimizes the change. We should
* reevaluate.
*/
arena_background_thread_inactivity_check(tsdn, arena,
/* is_background_thread */ false);
return false; return false;
} }