diff options
| author | Miles Bader <miles@lsi.nec.co.jp> | 2002-07-25 01:58:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@lsi.nec.co.jp> | 2002-07-25 01:58:57 +0000 |
| commit | 056f9d98941eb98e453bf4fa308f28b892525baf (patch) | |
| tree | 9adaefa6923b1949e06c4a81cf889976a7e8bb18 /libc/stdlib/malloc/heap_alloc_at.c | |
| parent | 255cd531d67d4c5d110409e2a24e2aa5a6249a7a (diff) | |
Redo the locking, so that it may actually work. Now locking is done at
the malloc/free level, not within the heap abstraction, and there's a
separate lock to control sbrk access.
Also, get rid of the separate `unmap_free_area' function in free.c, and
just put the code in the `free' function directly, which saves a bunch
of space (even compared to using an inline function) for some reason.
Diffstat (limited to 'libc/stdlib/malloc/heap_alloc_at.c')
| -rw-r--r-- | libc/stdlib/malloc/heap_alloc_at.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libc/stdlib/malloc/heap_alloc_at.c b/libc/stdlib/malloc/heap_alloc_at.c index 4047697c5..de84e99ee 100644 --- a/libc/stdlib/malloc/heap_alloc_at.c +++ b/libc/stdlib/malloc/heap_alloc_at.c @@ -26,8 +26,6 @@ __heap_alloc_at (struct heap *heap, void *mem, size_t size) size = HEAP_ADJUST_SIZE (size); - __heap_lock (heap); - HEAP_DEBUG (heap, "before __heap_alloc_at"); /* Look for a free area that can contain SIZE bytes. */ @@ -45,7 +43,5 @@ __heap_alloc_at (struct heap *heap, void *mem, size_t size) HEAP_DEBUG (heap, "after __heap_alloc_at"); - __heap_unlock (heap); - return alloced; } |