From 2d6ad18aa4ce46a82b84972e11f216b5ba2a85ac Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 11 Sep 2018 14:18:13 -0400 Subject: [PATCH] make function naming a bit more consistent --- malloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/malloc.c b/malloc.c index 6be7be1..e0c07d4 100644 --- a/malloc.c +++ b/malloc.c @@ -275,7 +275,7 @@ static void set_canary(struct slab_metadata *metadata, void *p, size_t size) { memcpy((char *)p + size - canary_size, &metadata->canary_value, canary_size); } -static inline void *slab_allocate(size_t requested_size) { +static inline void *allocate_small(size_t requested_size) { struct size_info info = get_size_info(requested_size); size_t size = info.size; struct size_class *c = &size_class_metadata[info.class]; @@ -399,7 +399,7 @@ static void enqueue_free_slab(struct size_class *c, struct slab_metadata *metada c->free_slabs_tail = metadata; } -static inline void slab_free(void *p) { +static inline void deallocate_small(void *p) { size_t class = slab_size_class(p); struct size_class *c = &size_class_metadata[class]; @@ -725,7 +725,7 @@ static size_t get_guard_size(struct random_state *state, size_t size) { static void *allocate(size_t size) { if (size <= max_slab_size_class) { - return slab_allocate(size); + return allocate_small(size); } mutex_lock(®ions_lock); @@ -891,7 +891,7 @@ EXPORT void *h_realloc(void *old, size_t size) { } memcpy(new, old, copy_size); if (old_size <= max_slab_size_class) { - slab_free(old); + deallocate_small(old); } else { deallocate_large(old); } @@ -984,7 +984,7 @@ EXPORT void h_free(void *p) { } if (p >= ro.slab_region_start && p < ro.slab_region_end) { - slab_free(p); + deallocate_small(p); return; }