diff options
| author | Jason Evans <jasone@canonware.com> | 2017-05-13 22:20:48 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2017-05-14 17:14:23 (GMT) |
| commit | 18a83681cf6fa0ab79cd0a89f8755d53931a39fb (patch) | |
| tree | eb4bfc6276e74fcfd65b38f37f733fb0daf26732 /src | |
| parent | 909f0482e479c1914a1bd528bf7ade702ed6415c (diff) | |
| download | jemalloc-18a83681cf6fa0ab79cd0a89f8755d53931a39fb.zip jemalloc-18a83681cf6fa0ab79cd0a89f8755d53931a39fb.tar.gz jemalloc-18a83681cf6fa0ab79cd0a89f8755d53931a39fb.tar.bz2 | |
Refactor (MALLOCX_ARENA_MAX + 1) to be MALLOCX_ARENA_LIMIT.
This resolves #673.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jemalloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index b5ef3ac..1321844 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -70,7 +70,7 @@ static malloc_mutex_t arenas_lock; * Points to an arena_t. */ JEMALLOC_ALIGNED(CACHELINE) -atomic_p_t arenas[MALLOCX_ARENA_MAX + 1]; +atomic_p_t arenas[MALLOCX_ARENA_LIMIT]; static atomic_u_t narenas_total; /* Use narenas_total_*(). */ static arena_t *a0; /* arenas[0]; read-only after initialization. */ unsigned narenas_auto; /* Read-only after initialization. */ @@ -400,7 +400,7 @@ arena_init_locked(tsdn_t *tsdn, unsigned ind, extent_hooks_t *extent_hooks) { arena_t *arena; assert(ind <= narenas_total_get()); - if (ind > MALLOCX_ARENA_MAX) { + if (ind >= MALLOCX_ARENA_LIMIT) { return NULL; } if (ind == narenas_total_get()) { @@ -1318,7 +1318,7 @@ malloc_init_narenas(void) { abort(); } } else { - if (ncpus > MALLOCX_ARENA_MAX) { + if (ncpus >= MALLOCX_ARENA_LIMIT) { malloc_printf("<jemalloc>: narenas w/ percpu" "arena beyond limit (%d)\n", ncpus); if (opt_abort) { @@ -1364,8 +1364,8 @@ malloc_init_narenas(void) { /* * Limit the number of arenas to the indexing range of MALLOCX_ARENA(). */ - if (narenas_auto > MALLOCX_ARENA_MAX) { - narenas_auto = MALLOCX_ARENA_MAX; + if (narenas_auto >= MALLOCX_ARENA_LIMIT) { + narenas_auto = MALLOCX_ARENA_LIMIT - 1; malloc_printf("<jemalloc>: Reducing narenas to limit (%d)\n", narenas_auto); } |