d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the 'n' option to decrease the number of arenas below the default,

Browse Source 
to as little as one arena.  Also, limit the number of arenas to avoid a
potential invariant violation in base_alloc().
This commit is contained in:
Jason Evans 2006-03-26 23:41:35 +00:00
parent 4328edf534
commit 9f9bc9367c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libc/stdlib/malloc.c
View File

@ -3200,8 +3200,22 @@ malloc_init_hard(void)
/* Determine how many arenas to use. */
narenas = ncpus;
if (opt_narenas_lshift > 0)
narenas <<= opt_narenas_lshift;
if (opt_narenas_lshift > 0) {
if ((narenas << opt_narenas_lshift) > narenas)
narenas <<= opt_narenas_lshift;
/*
* Make sure not to exceed the limits of what base_malloc()
* can handle.
*/
if (narenas * sizeof(arena_t *) > chunk_size)
narenas = chunk_size / sizeof(arena_t *);
} else if (opt_narenas_lshift < 0) {
if ((narenas << opt_narenas_lshift) < narenas)
narenas <<= opt_narenas_lshift;
/* Make sure there is at least one arena. */
if (narenas == 0)
narenas = 1;
}
#ifdef NO_TLS
if (narenas > 1) {