diff options
| author | Jason Evans <jasone@canonware.com> | 2017-05-31 23:45:14 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2017-06-01 15:55:27 (GMT) |
| commit | b511232fcd8aeb85d5dc8e0515539baa5d333991 (patch) | |
| tree | 4ee438cf7ec0bb10e87c45a8f7270d2c6734f3d9 /test/unit | |
| parent | 596b479d839d9f85538a6ff756a81e1ef8d4abb3 (diff) | |
| download | jemalloc-b511232fcd8aeb85d5dc8e0515539baa5d333991.zip jemalloc-b511232fcd8aeb85d5dc8e0515539baa5d333991.tar.gz jemalloc-b511232fcd8aeb85d5dc8e0515539baa5d333991.tar.bz2 | |
Refactor/fix background_thread/percpu_arena bootstrapping.
Refactor bootstrapping such that dlsym() is called during the
bootstrapping phase that can tolerate reentrant allocation.
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/mallctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/mallctl.c b/test/unit/mallctl.c index 80b84a0..f611654 100644 --- a/test/unit/mallctl.c +++ b/test/unit/mallctl.c @@ -327,18 +327,18 @@ TEST_END TEST_BEGIN(test_thread_arena) { unsigned old_arena_ind, new_arena_ind, narenas; - const char *opt_percpu_arena; - size_t sz = sizeof(opt_percpu_arena); - assert_d_eq(mallctl("opt.percpu_arena", &opt_percpu_arena, &sz, NULL, - 0), 0, "Unexpected mallctl() failure"); + const char *opa; + size_t sz = sizeof(opa); + assert_d_eq(mallctl("opt.percpu_arena", &opa, &sz, NULL, 0), 0, + "Unexpected mallctl() failure"); sz = sizeof(unsigned); assert_d_eq(mallctl("arenas.narenas", (void *)&narenas, &sz, NULL, 0), 0, "Unexpected mallctl() failure"); assert_u_eq(narenas, opt_narenas, "Number of arenas incorrect"); - if (strcmp(opt_percpu_arena, "disabled") == 0) { + if (strcmp(opa, "disabled") == 0) { new_arena_ind = narenas - 1; assert_d_eq(mallctl("thread.arena", (void *)&old_arena_ind, &sz, (void *)&new_arena_ind, sizeof(unsigned)), 0, @@ -350,7 +350,7 @@ TEST_BEGIN(test_thread_arena) { } else { assert_d_eq(mallctl("thread.arena", (void *)&old_arena_ind, &sz, NULL, 0), 0, "Unexpected mallctl() failure"); - new_arena_ind = percpu_arena_ind_limit() - 1; + new_arena_ind = percpu_arena_ind_limit(opt_percpu_arena) - 1; if (old_arena_ind != new_arena_ind) { assert_d_eq(mallctl("thread.arena", (void *)&old_arena_ind, &sz, (void *)&new_arena_ind, |