aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-28 23:28:29 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-28 23:28:29 +0000
commit07c35131ad1a9c6ebb1b073b9540eee55d850f89 (patch)
tree66b8a6f917af04562febd62971e391d98ba68c9f /malloc
parent5295113f8f7da48eedbcdbf1c375a42b7d90a9f5 (diff)
downloadglibc-07c35131ad1a9c6ebb1b073b9540eee55d850f89.zip
glibc-07c35131ad1a9c6ebb1b073b9540eee55d850f89.tar.gz
glibc-07c35131ad1a9c6ebb1b073b9540eee55d850f89.tar.bz2
Update.
2000-06-28 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c (chunk_alloc): If extension of the linear heap fails, try mmap_chunk() as a last resort even though n_mmaps_max may have been reached.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 21cb9d9..8eed746 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1872,8 +1872,6 @@ mmap_chunk(size) size_t size;
size_t page_mask = malloc_getpagesize - 1;
mchunkptr p;
- if(n_mmaps >= n_mmaps_max) return 0; /* too many regions */
-
/* For mmapped chunks, the overhead is one SIZE_SZ unit larger, because
* there is no following chunk whose prev_size field could be used.
*/
@@ -2930,8 +2928,10 @@ chunk_alloc(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb;
{
#if HAVE_MMAP
- /* If big and would otherwise need to extend, try to use mmap instead */
+ /* If the request is big and there are not yet too many regions,
+ and we would otherwise need to extend, try to use mmap instead. */
if ((unsigned long)nb >= (unsigned long)mmap_threshold &&
+ n_mmaps < n_mmaps_max &&
(victim = mmap_chunk(nb)) != 0)
return victim;
#endif
@@ -2939,7 +2939,15 @@ chunk_alloc(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb;
/* Try to extend */
malloc_extend_top(ar_ptr, nb);
if ((remainder_size = chunksize(top(ar_ptr)) - nb) < (long)MINSIZE)
+ {
+#if HAVE_MMAP
+ /* A last attempt: when we are out of address space in the arena,
+ try mmap anyway, disregarding n_mmaps_max. */
+ if((victim = mmap_chunk(nb)) != 0)
+ return victim;
+#endif
return 0; /* propagate failure */
+ }
}
victim = top(ar_ptr);