diff options
| author | Miles Bader <miles@lsi.nec.co.jp> | 2002-07-25 07:31:09 +0000 |
|---|---|---|
| committer | Miles Bader <miles@lsi.nec.co.jp> | 2002-07-25 07:31:09 +0000 |
| commit | c5568de190ec2806ce36e063865bfee66d30d032 (patch) | |
| tree | 319336d7c9fa8da24fbe33c01b103d8ba4de937b /libc/stdlib/malloc/free.c | |
| parent | 5446f4e74f052ca4fea226a8fdb89502d6520a32 (diff) | |
Size tweaks.
Diffstat (limited to 'libc/stdlib/malloc/free.c')
| -rw-r--r-- | libc/stdlib/malloc/free.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c index 3074ff5e6..6de5237dc 100644 --- a/libc/stdlib/malloc/free.c +++ b/libc/stdlib/malloc/free.c @@ -26,6 +26,7 @@ free (void *mem) { size_t size; struct heap_free_area *fa; + struct heap *heap = &__malloc_heap; mem -= MALLOC_ALIGNMENT; size = *(size_t *)mem; @@ -36,7 +37,7 @@ free (void *mem) __malloc_lock (); /* Put MEM back in the heap, and get the free-area it was placed in. */ - fa = __heap_free (&__malloc_heap, mem, size); + fa = __heap_free (heap, mem, size); /* See if the free-area FA has grown big enough that it should be unmapped. */ @@ -79,7 +80,7 @@ free (void *mem) start, end, end - start); /* Remove FA from the heap. */ - __heap_unlink_free_area (&__malloc_heap, fa); + __heap_unlink_free_area (heap, fa); if (!fa->next && !fa->prev) /* We want to avoid the heap from losing all memory, so reserve @@ -90,7 +91,7 @@ free (void *mem) /* Put the reserved memory back in the heap; we asssume that MALLOC_UNMAP_THRESHOLD is greater than MALLOC_MIN_SIZE, so we use the latter unconditionally here. */ - __heap_free (&__malloc_heap, (void *)start, MALLOC_MIN_SIZE); + __heap_free (heap, (void *)start, MALLOC_MIN_SIZE); start += MALLOC_MIN_SIZE; } @@ -119,13 +120,13 @@ free (void *mem) { if (unmap_start - start < HEAP_MIN_FREE_AREA_SIZE) unmap_start += MALLOC_PAGE_SIZE; - __heap_free (&__malloc_heap, (void *)start, unmap_start - start); + __heap_free (heap, (void *)start, unmap_start - start); } if (end > unmap_end) { if (end - unmap_end < HEAP_MIN_FREE_AREA_SIZE) unmap_end -= MALLOC_PAGE_SIZE; - __heap_free (&__malloc_heap, (void *)unmap_end, end - unmap_end); + __heap_free (heap, (void *)unmap_end, end - unmap_end); } /* Release the malloc lock before we do the system call. */ |