This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] malloc: Avoid premature fallback to mmap [BZ #20284]
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Tue, 21 Jun 2016 17:21:18 +0200
- Subject: [PATCH] malloc: Avoid premature fallback to mmap [BZ #20284]
- Authentication-results: sourceware.org; auth=none
2016-06-21 Florian Weimer <fweimer@redhat.com>
[BZ #20284]
* malloc/arena.c (reused_arena): Do not return NULL if we start
out with a non-corrupted arena.
diff --git a/malloc/arena.c b/malloc/arena.c
index ed5a4d5..229783f 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -771,14 +771,12 @@ reused_arena (mstate avoid_arena)
{
result = result->next;
if (result == begin)
- break;
+ /* We looped around the arena list. We could not find any
+ arena that was either not corrupted or not the one we
+ wanted to avoid. */
+ return NULL;
}
- /* We could not find any arena that was either not corrupted or not the one
- we wanted to avoid. */
- if (result == begin || result == avoid_arena)
- return NULL;
-
/* No arena available without contention. Wait for the next in line. */
LIBC_PROBE (memory_arena_reuse_wait, 3, &result->mutex, result, avoid_arena);
(void) mutex_lock (&result->mutex);