diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | malloc/malloc.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 941d2f4223..76654d30c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2006-10-13 Ulrich Drepper <drepper@redhat.com> - * malloc/malloc.c (do_check_malloc_state): Only require for empty - bins for large sizes in main arena. + [BZ #3313] + * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to + determine highest fast bin to consolidate, always look into all of + them. + (do_check_malloc_state): Only require for empty bins for large + sizes in main arena. * libio/stdio.h: Add more __wur attributes. diff --git a/malloc/malloc.c b/malloc/malloc.c index e4b693c342..38ceb1e909 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4692,7 +4692,15 @@ static void malloc_consolidate(av) mstate av; reused anyway. */ +#if 0 + /* It is wrong to limit the fast bins to search using get_max_fast + because, except for the main arena, all the others might have + blocks in the high fast bins. It's not worth it anyway, just + search all bins all the time. */ maxfb = &(av->fastbins[fastbin_index(get_max_fast ())]); +#else + maxfb = &(av->fastbins[NFASTBINS]); +#endif fb = &(av->fastbins[0]); do { if ( (p = *fb) != 0) { |