aboutsummaryrefslogtreecommitdiff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-19 22:34:27 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-19 22:34:27 +0000
commit72320021f73568672d27ac090b1c0594c6fa0296 (patch)
tree056420f4e791f2946ea84b2efaf8f6ada7abe97c /malloc/malloc.c
parented3691bab2a633991d2b30f4367221a9d804fedc (diff)
downloadglibc-72320021f73568672d27ac090b1c0594c6fa0296.tar
glibc-72320021f73568672d27ac090b1c0594c6fa0296.tar.gz
glibc-72320021f73568672d27ac090b1c0594c6fa0296.tar.bz2
glibc-72320021f73568672d27ac090b1c0594c6fa0296.zip
* malloc/malloc.c (_int_malloc): Limit number of unsorted blocks
to sort in each call.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 890d3669e2..3f4ddcd7f7 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4055,6 +4055,8 @@ _int_malloc(mstate av, size_t bytes)
for(;;) {
+ int iters = 0;
+ bool any_larger = false;
while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) {
bck = victim->bk;
if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0)
@@ -4145,6 +4147,12 @@ _int_malloc(mstate av, size_t bytes)
}
}
+ if (size >= nb)
+ any_larger = true;
+#define MAX_ITERS 10000
+ if (++iters == MAX_ITERS)
+ break;
+
mark_bin(av, victim_index);
victim->bk = bck;
victim->fd = fwd;