From 7cf8e20d03a43b1375e90d381a16caa2686e4fdf Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 31 Jan 2012 14:42:34 -0500 Subject: [PATCH] Handle ARENA_TEST correctly (cherry picked from commit 41b81892f11fe1353123e892158b53de73863d62) --- ChangeLog | 6 ++++++ malloc/arena.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 267266b4cc8..911a76182cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,12 @@ * sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept instead of feraiseexcept. +2012-01-31 Ulrich Drepper + + * malloc/arena.c (arena_get2): Really don't call __get_nprocs if + ARENA_TEST says not to. Simplify test for creation of a new arena. + Partially based on a patch by Siddhesh Poyarekar . + 2012-01-28 Chris Metcalf * scripts/firstversions.awk: Fix bug in version range handling. diff --git a/malloc/arena.c b/malloc/arena.c index cb8548ba3f0..f88b41d19b0 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size) { if (mp_.arena_max != 0) narenas_limit = mp_.arena_max; - else + else if (narenas > mp_.arena_test) { int n = __get_nprocs (); @@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size) } repeat:; size_t n = narenas; - if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) + /* NB: the following depends on the fact that (size_t)0 - 1 is a + very large number and that the underflow is OK. If arena_max + is set the value of arena_test is irrelevant. If arena_test + is set but narenas is not yet larger or equal to arena_test + narenas_limit is 0. There is no possibility for narenas to + be too big for the test to always fail since there is not + enough address space to create that many arenas. */ + if (__builtin_expect (n <= narenas_limit - 1, 0)) { if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n)) goto repeat; -- 2.47.2