mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fast-import: rename mem_pool type to mp_block

Browse Source 
This is part of a patch series to extract the memory pool logic in
fast-import into a more generalized version. The existing mem_pool type
maps more closely to a "block of memory" (mp_block) in the more
generalized memory pool. This commit renames the mem_pool to mp_block to
reduce churn in future patches.

Signed-off-by: Jameson Miller <jamill@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jameson Miller
2018-04-11 18:37:53 +00:00
committed by Junio C Hamano
parent 90bbd502d5
commit 7dc0656e2f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fast-import.c
View File

@ -209,8 +209,8 @@ struct last_object {
unsigned no_swap : 1; unsigned no_swap : 1;
}; };
struct mem_pool { struct mp_block {
struct mem_pool *next_pool; struct mp_block *next_block;
char *next_free; char *next_free;
char *end; char *end;
uintmax_t space[FLEX_ARRAY]; /* more */ uintmax_t space[FLEX_ARRAY]; /* more */
@ -304,9 +304,9 @@ static int global_argc;
static const char **global_argv; static const char **global_argv;
/* Memory pools */ /* Memory pools */
static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool); static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mp_block);
static size_t total_allocd; static size_t total_allocd;
static struct mem_pool *mem_pool; static struct mp_block *mp_block_head;
/* Atom management */ /* Atom management */
static unsigned int atom_table_sz = 4451; static unsigned int atom_table_sz = 4451;
@ -636,14 +636,14 @@ static unsigned int hc_str(const char *s, size_t len)
static void *pool_alloc(size_t len) static void *pool_alloc(size_t len)
{ {
struct mem_pool *p; struct mp_block *p;
void *r; void *r;
/* round up to a 'uintmax_t' alignment */ /* round up to a 'uintmax_t' alignment */
if (len & (sizeof(uintmax_t) - 1)) if (len & (sizeof(uintmax_t) - 1))
len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1)); len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
for (p = mem_pool; p; p = p->next_pool) for (p = mp_block_head; p; p = p->next_block)
if ((p->end - p->next_free >= len)) if ((p->end - p->next_free >= len))
break; break;
@ -652,12 +652,12 @@ static void *pool_alloc(size_t len)
total_allocd += len; total_allocd += len;
return xmalloc(len); return xmalloc(len);
} }
total_allocd += sizeof(struct mem_pool) + mem_pool_alloc; total_allocd += sizeof(struct mp_block) + mem_pool_alloc;
p = xmalloc(st_add(sizeof(struct mem_pool), mem_pool_alloc)); p = xmalloc(st_add(sizeof(struct mp_block), mem_pool_alloc));
p->next_pool = mem_pool; p->next_block = mp_block_head;
p->next_free = (char *) p->space; p->next_free = (char *) p->space;
p->end = p->next_free + mem_pool_alloc; p->end = p->next_free + mem_pool_alloc;
mem_pool = p; mp_block_head = p;
} }
r = p->next_free; r = p->next_free;