diff options
| -rw-r--r-- | core/malloc.c | 2 | ||||
| -rw-r--r-- | core/mem_region.c | 2 | ||||
| -rw-r--r-- | core/test/run-mem_region.c | 8 | ||||
| -rw-r--r-- | include/mem_region.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/core/malloc.c b/core/malloc.c index 692a5014..9e715f68 100644 --- a/core/malloc.c +++ b/core/malloc.c @@ -63,7 +63,7 @@ void *__realloc(void *ptr, size_t size, const char *location) newptr = mem_alloc(&skiboot_heap, size, DEFAULT_ALIGN, location); if (newptr) { - size_t copy = mem_size(&skiboot_heap, ptr); + size_t copy = mem_allocated_size(ptr); if (copy > size) copy = size; memcpy(newptr, ptr, copy); diff --git a/core/mem_region.c b/core/mem_region.c index dd1f64f9..10404f5b 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -396,7 +396,7 @@ void mem_free(struct mem_region *region, void *mem, const char *location) make_free(region, (struct free_hdr *)hdr, location); } -size_t mem_size(const struct mem_region *region __unused, const void *ptr) +size_t mem_allocated_size(const void *ptr) { const struct alloc_hdr *hdr = ptr - sizeof(*hdr); return hdr->num_longs * sizeof(long) - sizeof(struct alloc_hdr); diff --git a/core/test/run-mem_region.c b/core/test/run-mem_region.c index f0ad2c2b..db1ca026 100644 --- a/core/test/run-mem_region.c +++ b/core/test/run-mem_region.c @@ -101,7 +101,7 @@ int main(void) assert(!strcmp(((struct alloc_hdr *)p)[-1].location, "here")); assert(p > (void *)test_heap); assert(p + (1ULL << i) <= (void *)test_heap + TEST_HEAP_SIZE); - assert(mem_size(&skiboot_heap, p) >= 1ULL << i); + assert(mem_allocated_size(p) >= 1ULL << i); mem_free(&skiboot_heap, p, "freed"); assert(heap_empty()); assert(mem_check(&skiboot_heap)); @@ -177,7 +177,7 @@ int main(void) p = mem_alloc(&skiboot_heap, 1, 1, "one byte"); assert(p); assert(mem_resize(&skiboot_heap, p, 100, "hundred bytes")); - assert(mem_size(&skiboot_heap, p) >= 100); + assert(mem_allocated_size(p) >= 100); assert(mem_check(&skiboot_heap)); assert(!strcmp(((struct alloc_hdr *)p)[-1].location, "hundred bytes")); mem_free(&skiboot_heap, p, "freed"); @@ -186,7 +186,7 @@ int main(void) p = mem_alloc(&skiboot_heap, 100, 1, "100 bytes"); assert(p); assert(mem_resize(&skiboot_heap, p, 1, "1 byte")); - assert(mem_size(&skiboot_heap, p) < 100); + assert(mem_allocated_size(p) < 100); assert(mem_check(&skiboot_heap)); assert(!strcmp(((struct alloc_hdr *)p)[-1].location, "1 byte")); mem_free(&skiboot_heap, p, "freed"); @@ -196,7 +196,7 @@ int main(void) assert(p); for (i = 1; i <= TEST_HEAP_SIZE - sizeof(struct alloc_hdr); i++) { assert(mem_resize(&skiboot_heap, p, i, "enlarge")); - assert(mem_size(&skiboot_heap, p) >= i); + assert(mem_allocated_size(p) >= i); assert(mem_check(&skiboot_heap)); } diff --git a/include/mem_region.h b/include/mem_region.h index b2547e56..1d78344f 100644 --- a/include/mem_region.h +++ b/include/mem_region.h @@ -50,7 +50,7 @@ void mem_free(struct mem_region *region, void *mem, const char *location); bool mem_resize(struct mem_region *region, void *mem, size_t len, const char *location); -size_t mem_size(const struct mem_region *region, const void *ptr); +size_t mem_allocated_size(const void *ptr); bool mem_check(const struct mem_region *region); void mem_region_release_unused(void); |
