system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-05 08:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove loops in arena_coalesce(). They are no longer necessary, now that

Browse source 
internal allocation does not rely on recursive arena use (base_arena was
removed in revision 1.95).
This commit is contained in:
Jason Evans 2006-01-19 18:37:30 +00:00
parent 5f9cc6261d
commit a3bb22bc8e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=154555
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/libc/stdlib/malloc.c
View file

@ -1789,7 +1789,7 @@ arena_coalesce(arena_t *arena, region_t **reg, size_t size)
assert(region_prev_free_get(&next->sep));
assert(region_next_size_get(&treg->sep) == next->prev.size);
while (region_prev_free_get(&treg->sep)) {
if (region_prev_free_get(&treg->sep)) {
prev_size = treg->prev.size;
prev = (region_t *)&((char *)treg)[-prev_size];
assert(region_next_free_get(&prev->sep));
@ -1801,13 +1801,13 @@ arena_coalesce(arena_t *arena, region_t **reg, size_t size)
treg = prev;
#ifdef MALLOC_STATS
if (ret == false)
arena->stats.ncoalesce++;
arena->stats.ncoalesce++;
#endif
ret = true;
}
assert(region_prev_free_get(&treg->sep) == false);
while (region_next_free_get(&next->sep)) {
if (region_next_free_get(&next->sep)) {
next_size = region_next_size_get(&next->sep);
nextnext = (region_t *)&((char *)next)[next_size];
assert(region_prev_free_get(&nextnext->sep));
@ -1828,6 +1828,7 @@ arena_coalesce(arena_t *arena, region_t **reg, size_t size)
next = (region_t *)&((char *)treg)[tsize];
}
assert(region_next_free_get(&next->sep) == false);
/* Update header/footer. */
if (ret) {