remove indirection

Author: minad

bench.c

@@ -15,7 +15,7 @@
 #include <time.h>
 #include "tlsf.h"
 
-static tlsf t;
+static tlsf t = TLSF_INIT;
 
 static void usage(const char *name) {
     printf("run a malloc benchmark.\n"
@@ -94,7 +94,7 @@ static void run_alloc_benchmark(size_t loops, size_t blk_min, size_t blk_max,
 static size_t max_size;
 static void* mem = 0;
 
-static void* resize(tlsf* _t, size_t req_size) {
+void* tlsf_resize(tlsf* _t, size_t req_size) {
     (void)_t;
     return req_size <= max_size ? mem : 0;
 }
@@ -130,7 +130,6 @@ int main(int argc, char **argv) {
 
     max_size = blk_max * num_blks;
     mem = malloc(max_size);
-    tlsf_init(&t, resize);
 
     void** blk_array = (void**)calloc(num_blks, sizeof(void*));
     assert(blk_array);

test.c

@@ -18,7 +18,7 @@ static size_t MAX_PAGES;
 static size_t curr_pages = 0;
 static void* start_addr = 0;
 
-static void* resize(tlsf* t, size_t req_size) {
+void* tlsf_resize(tlsf* t, size_t req_size) {
     (void)t;
 
     if (!start_addr)
@@ -158,10 +158,7 @@ static void large_size_test(tlsf* t) {
 int main(void) {
     PAGE = (size_t)sysconf(_SC_PAGESIZE);
     MAX_PAGES = 20 * TLSF_MAX_SIZE / PAGE;
-
-    tlsf t;
-    tlsf_init(&t, resize);
-
+    tlsf t = TLSF_INIT;
     srand((unsigned int)time(0));
     large_size_test(&t);
     random_sizes_test(&t);

tlsf.c

@@ -350,7 +350,7 @@ TLSF_INL void check_sentinel(tlsf_block* block) {
 
 static bool arena_grow(tlsf* t, size_t size) {
     size_t req_size = (t->size ? t->size + BLOCK_OVERHEAD : 2*BLOCK_OVERHEAD) + size;
-    void* addr = t->resize(t, req_size);
+    void* addr = tlsf_resize(t, req_size);
     if (!addr)
         return false;
     TLSF_ASSERT((size_t)addr % ALIGN_SIZE == 0, "wrong heap alignment address");
@@ -375,7 +375,7 @@ static void arena_shrink(tlsf* t, tlsf_block* block) {
     t->size = t->size - size - BLOCK_OVERHEAD;
     if (t->size == BLOCK_OVERHEAD)
         t->size = 0;
-    t->resize(t, t->size);
+    tlsf_resize(t, t->size);
     if (t->size) {
         block->header = 0;
         check_sentinel(block);
@@ -398,11 +398,6 @@ TLSF_INL tlsf_block* block_find_free(tlsf* t, size_t size) {
     return block;
 }
 
-TLSF_API void tlsf_init(tlsf* t, tlsf_resize resize) {
-    memset(t, 0, sizeof (tlsf));
-    t->resize = resize;
-}
-
 TLSF_API void* tlsf_malloc(tlsf* t, size_t size) {
     size = adjust_size(size, ALIGN_SIZE);
     if (UNLIKELY(size > TLSF_MAX_SIZE))

tlsf.h

@@ -11,18 +11,15 @@
 #define _TLSF_FL_COUNT (sizeof (size_t) == 8 ? 32 : 25)
 #define _TLSF_FL_MAX   (sizeof (size_t) == 8 ? 38 : 30)
 #define TLSF_MAX_SIZE  (((size_t)1 << (_TLSF_FL_MAX - 1)) - sizeof (size_t))
+#define TLSF_INIT      (tlsf){.size=0}
 
-typedef struct tlsf_ tlsf;
-typedef void* (*tlsf_resize)(tlsf*, size_t);
-
-struct tlsf_ {
+typedef struct {
     uint32_t fl, sl[_TLSF_FL_COUNT];
     struct tlsf_block_* block[_TLSF_FL_COUNT][_TLSF_SL_COUNT];
-    tlsf_resize resize;
-    size_t      size;
-};
+    size_t size;
+} tlsf;
 
-TLSF_API void tlsf_init(tlsf*, tlsf_resize);
+TLSF_API void* tlsf_resize(tlsf*, size_t);
 TLSF_API void* tlsf_aalloc(tlsf*, size_t, size_t);
 TLSF_API void* tlsf_malloc(tlsf*, size_t);
 TLSF_API void* tlsf_realloc(tlsf*, void*, size_t);