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

Prevent background threads from running in post_reset().

Browse Source 
We lookup freed extents for testing in post_reset.  Take background_thread lock
so that the extents are not modified at the same time.
This commit is contained in:
Qi Wang 2017-06-11 11:40:59 -07:00 committed by Qi Wang
parent 394df9519d
commit 813643c6a7
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/unit/arena_reset.c
View File

@ -134,17 +134,25 @@ do_arena_reset_pre(unsigned arena_ind, void ***ptrs, unsigned *nptrs) {
} }
static void static void
do_arena_reset_post(void **ptrs, unsigned nptrs) { do_arena_reset_post(void **ptrs, unsigned nptrs, unsigned arena_ind) {
tsdn_t *tsdn; tsdn_t *tsdn;
unsigned i; unsigned i;
tsdn = tsdn_fetch(); tsdn = tsdn_fetch();
if (have_background_thread) {
malloc_mutex_lock(tsdn,
&background_thread_info[arena_ind % ncpus].mtx);
}
/* Verify allocations no longer exist. */ /* Verify allocations no longer exist. */
for (i = 0; i < nptrs; i++) { for (i = 0; i < nptrs; i++) {
assert_zu_eq(vsalloc(tsdn, ptrs[i]), 0, assert_zu_eq(vsalloc(tsdn, ptrs[i]), 0,
"Allocation should no longer exist"); "Allocation should no longer exist");
} }
if (have_background_thread) {
malloc_mutex_unlock(tsdn,
&background_thread_info[arena_ind % ncpus].mtx);
}
free(ptrs); free(ptrs);
} }
@ -180,7 +188,7 @@ TEST_BEGIN(test_arena_reset) {
arena_ind = do_arena_create(NULL); arena_ind = do_arena_create(NULL);
do_arena_reset_pre(arena_ind, &ptrs, &nptrs); do_arena_reset_pre(arena_ind, &ptrs, &nptrs);
do_arena_reset(arena_ind); do_arena_reset(arena_ind);
do_arena_reset_post(ptrs, nptrs); do_arena_reset_post(ptrs, nptrs, arena_ind);
} }
TEST_END TEST_END
@ -239,7 +247,7 @@ TEST_BEGIN(test_arena_destroy_hooks_default) {
assert_true(arena_i_initialized(MALLCTL_ARENAS_DESTROYED, false), assert_true(arena_i_initialized(MALLCTL_ARENAS_DESTROYED, false),
"Destroyed arena stats should be initialized"); "Destroyed arena stats should be initialized");
do_arena_reset_post(ptrs, nptrs); do_arena_reset_post(ptrs, nptrs, arena_ind);
arena_ind_prev = arena_ind; arena_ind_prev = arena_ind;
arena_ind = do_arena_create(NULL); arena_ind = do_arena_create(NULL);
@ -247,7 +255,7 @@ TEST_BEGIN(test_arena_destroy_hooks_default) {
assert_u_eq(arena_ind, arena_ind_prev, assert_u_eq(arena_ind, arena_ind_prev,
"Arena index should have been recycled"); "Arena index should have been recycled");
do_arena_destroy(arena_ind); do_arena_destroy(arena_ind);
do_arena_reset_post(ptrs, nptrs); do_arena_reset_post(ptrs, nptrs, arena_ind);
do_arena_destroy(arena_ind_another); do_arena_destroy(arena_ind_another);
} }
@ -320,7 +328,7 @@ TEST_BEGIN(test_arena_destroy_hooks_unmap) {
assert_true(arena_i_initialized(MALLCTL_ARENAS_DESTROYED, false), assert_true(arena_i_initialized(MALLCTL_ARENAS_DESTROYED, false),
"Destroyed arena stats should be initialized"); "Destroyed arena stats should be initialized");
do_arena_reset_post(ptrs, nptrs); do_arena_reset_post(ptrs, nptrs, arena_ind);
memcpy(&hooks, &hooks_orig, sizeof(extent_hooks_t)); memcpy(&hooks, &hooks_orig, sizeof(extent_hooks_t));
} }