mirror of
https://github.com/git/git.git
synced 2024-06-08 18:16:09 +02:00
mem-pool: move reusable parts of memory pool into its own file
This moves the reusable parts of the memory pool logic used by fast-import.c into its own file for use by other components. Signed-off-by: Jameson Miller <jamill@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
96c47d1466
commit
065feab4eb
1
Makefile
1
Makefile
|
@ -833,6 +833,7 @@ LIB_OBJS += log-tree.o
|
||||||
LIB_OBJS += mailinfo.o
|
LIB_OBJS += mailinfo.o
|
||||||
LIB_OBJS += mailmap.o
|
LIB_OBJS += mailmap.o
|
||||||
LIB_OBJS += match-trees.o
|
LIB_OBJS += match-trees.o
|
||||||
|
LIB_OBJS += mem-pool.o
|
||||||
LIB_OBJS += merge.o
|
LIB_OBJS += merge.o
|
||||||
LIB_OBJS += merge-blobs.o
|
LIB_OBJS += merge-blobs.o
|
||||||
LIB_OBJS += merge-recursive.o
|
LIB_OBJS += merge-recursive.o
|
||||||
|
|
|
@ -168,6 +168,7 @@ Format of STDIN stream:
|
||||||
#include "dir.h"
|
#include "dir.h"
|
||||||
#include "run-command.h"
|
#include "run-command.h"
|
||||||
#include "packfile.h"
|
#include "packfile.h"
|
||||||
|
#include "mem-pool.h"
|
||||||
|
|
||||||
#define PACK_ID_BITS 16
|
#define PACK_ID_BITS 16
|
||||||
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
|
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
|
||||||
|
@ -209,26 +210,6 @@ struct last_object {
|
||||||
unsigned no_swap : 1;
|
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 {
|
||||||
struct atom_str *next_atom;
|
struct atom_str *next_atom;
|
||||||
unsigned short str_len;
|
unsigned short str_len;
|
||||||
|
@ -647,55 +628,6 @@ static unsigned int hc_str(const char *s, size_t len)
|
||||||
return r;
|
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)
|
static char *pool_strdup(const char *s)
|
||||||
{
|
{
|
||||||
size_t len = strlen(s) + 1;
|
size_t len = strlen(s) + 1;
|
||||||
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
/*
|
||||||
|
* Memory Pool implementation logic.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "cache.h"
|
||||||
|
#include "mem-pool.h"
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
|
@ -0,0 +1,34 @@
|
||||||
|
#ifndef MEM_POOL_H
|
||||||
|
#define MEM_POOL_H
|
||||||
|
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Alloc memory from the mem_pool.
|
||||||
|
*/
|
||||||
|
void *mem_pool_alloc(struct mem_pool *pool, size_t len);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Allocate and zero memory from the memory pool.
|
||||||
|
*/
|
||||||
|
void *mem_pool_calloc(struct mem_pool *pool, size_t count, size_t size);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue