diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 2 | ||||
| -rw-r--r-- | src/lib.c | 36 |
2 files changed, 23 insertions, 15 deletions
diff --git a/src/array.c b/src/array.c index 37ae7b4..c94994b 100644 --- a/src/array.c +++ b/src/array.c @@ -141,5 +141,5 @@ static inline u32 _al_array_reserve(void **ptr, u32 prev_size, u32 size) { - return al_growing_allocation(ptr, prev_size, size, AL_ARRAY_MALLOC, AL_ARRAY_REALLOC); + return al_growing_allocation(ptr, prev_size, size, AL_ARRAY_REALLOC); } @@ -40,6 +40,7 @@ static array(struct al_alloc_t) allocations; static size_t current_alloc = 0; static size_t peak_alloc = 0; static size_t total_alloc = 0; +static size_t alloc_operations = 0; #define total_changed_by(n) \ total_alloc += (n); \ @@ -48,7 +49,8 @@ static size_t total_alloc = 0; current_alloc += (n); \ if (current_alloc > peak_alloc) { \ peak_alloc = current_alloc; \ - } + } \ + alloc_operations++; void al_malloc_init(void) { @@ -76,11 +78,11 @@ void *al_calloc(size_t n, size_t size) { al_printf("**al_calloc(%zu, %zu)\n", n, size); void *ptr = _al_calloc(n, size); - size_t real_size = n * size; + size_t total_size = n * size; _al_malloc_lock(); - total_changed_by(real_size); - current_changed_by(real_size); - al_array_push(allocations, ((struct al_alloc_t){ ptr, real_size })); + total_changed_by(total_size); + current_changed_by(total_size); + al_array_push(allocations, ((struct al_alloc_t){ ptr, total_size })); _al_malloc_unlock(); return ptr; } @@ -88,15 +90,20 @@ void *al_calloc(size_t n, size_t size) void *al_realloc(void *ptr, size_t n) { al_printf("**al_realloc(%p, %zu)\n", ptr, n); +#ifdef AL_PARANOID_REALLOC + void *new_ptr = ptr ? _al_realloc(ptr, n) : _al_malloc(n); +#else void *new_ptr = _al_realloc(ptr, n); +#endif _al_malloc_lock(); total_changed_by(n); if (!ptr) { current_changed_by(n); - al_array_push(allocations, ((struct al_alloc_t){ ptr, n })); + al_array_push(allocations, ((struct al_alloc_t){ new_ptr, n })); } else { struct al_alloc_t *alloc; al_array_foreach_ptr(allocations, i, alloc) { + al_assert(alloc->ptr); if (alloc->ptr == ptr) { ptrdiff_t diff = (ptrdiff_t)n - (ptrdiff_t)alloc->size; current_changed_by(diff); @@ -118,10 +125,10 @@ void al_free(void *ptr) struct al_alloc_t *alloc; al_array_foreach_ptr(allocations, i, alloc) { if (alloc->ptr == ptr) { + al_assert(!found); current_changed_by(-alloc->size); al_array_remove_at(allocations, i); found = true; - break; } } al_assert(found); @@ -144,12 +151,13 @@ s32 al_posix_memalign(void **ptr, size_t alignment, size_t n) } #endif -void al_malloc_stats(size_t *current, size_t *peak, size_t *total) +void al_malloc_stats(size_t *current, size_t *peak, size_t *total, size_t *ops) { _al_malloc_lock(); *current = current_alloc; *peak = peak_alloc; *total = total_alloc; + *ops = alloc_operations; _al_malloc_unlock(); } @@ -172,15 +180,15 @@ void al_set_alloc(void *(*malloc_func)(size_t), void *(*calloc_func)(size_t, siz } #endif -u32 al_grow_step = 0x3fff; // 0b11111111111111 - -u32 al_growing_allocation(void **ptr, u32 prev_size, u32 size, - void *(*malloc_func)(size_t), void *(*realloc_func)(void *, size_t)) +u32 al_grow_step = 0xfff; // 0b111111111111, 4095 +//u32 al_grow_step = 0x3fff; // 0b11111111111111, 16383 +u32 al_growing_allocation(void **ptr, u32 prev_size, u32 size, void *(*realloc_func)(void *, size_t)) { if (size <= prev_size) return prev_size; al_assert(size > 0); - if (size < al_grow_step) { + if (size <= al_grow_step) { + // next_power_of_two(4096) = 4096. size = al_next_power_of_two(size); } else { size = al_u32_add_wrap(size, al_grow_step, MAX_ALLOC_32) & ~al_grow_step; @@ -188,7 +196,7 @@ u32 al_growing_allocation(void **ptr, u32 prev_size, u32 size, // size can only be 0 after wrapping around MAX_ALLOC_32 (zero all possible bits). if (size == 0) size = MAX_ALLOC_32; - *ptr = (!*ptr) ? malloc_func(size) : realloc_func(*ptr, size); + *ptr = realloc_func(*ptr, size); al_assert(*ptr); return size; |