mem-pool: move reusable parts of memory pool into its own file

diff --git a/fast-import.c b/fast-import.c
index 0f624a6d01187e3265adb9a59bedbd8b2d0788c9..ba0cb4bdfb69c3127058a3b923c94f1ea613508b 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -168,6 +168,7 @@ Format of STDIN stream:
 #include "dir.h"
 #include "run-command.h"
 #include "packfile.h"
+#include "mem-pool.h"
 
 #define PACK_ID_BITS 16
 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -209,26 +210,6 @@ struct last_object {
        unsigned no_swap : 1;
 };
 
-struct mp_block {
-       struct mp_block *next_block;
-       char *next_free;
-       char *end;
-       uintmax_t space[FLEX_ARRAY]; /* more */
-};
-
-struct mem_pool {
-       struct mp_block *mp_block;
-
-       /*
-        * The amount of available memory to grow the pool by.
-        * This size does not include the overhead for the mp_block.
-        */
-       size_t block_alloc;
-
-       /* The total amount of memory allocated by the pool. */
-       size_t pool_alloc;
-};
-
 struct atom_str {
        struct atom_str *next_atom;
        unsigned short str_len;
@@ -647,55 +628,6 @@ static unsigned int hc_str(const char *s, size_t len)
        return r;
 }
 
-static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t block_alloc)
-{
-       struct mp_block *p;
-
-       mem_pool->pool_alloc += sizeof(struct mp_block) + block_alloc;
-       p = xmalloc(st_add(sizeof(struct mp_block), block_alloc));
-       p->next_block = mem_pool->mp_block;
-       p->next_free = (char *)p->space;
-       p->end = p->next_free + block_alloc;
-       mem_pool->mp_block = p;
-
-       return p;
-}
-
-static void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len)
-{
-       struct mp_block *p;
-       void *r;
-
-       /* round up to a 'uintmax_t' alignment */
-       if (len & (sizeof(uintmax_t) - 1))
-               len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
-
-       for (p = mem_pool->mp_block; p; p = p->next_block)
-               if (p->end - p->next_free >= len)
-                       break;
-
-       if (!p) {
-               if (len >= (mem_pool->block_alloc / 2)) {
-                       mem_pool->pool_alloc += len;
-                       return xmalloc(len);
-               }
-
-               p = mem_pool_alloc_block(mem_pool, mem_pool->block_alloc);
-       }
-
-       r = p->next_free;
-       p->next_free += len;
-       return r;
-}
-
-static void *mem_pool_calloc(struct mem_pool *mem_pool, size_t count, size_t size)
-{
-       size_t len = st_mult(count, size);
-       void *r = mem_pool_alloc(mem_pool, len);
-       memset(r, 0, len);
-       return r;
-}
-
 static char *pool_strdup(const char *s)
 {
        size_t len = strlen(s) + 1;