undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mem-pool: use consistent pool variable name

Browse Source 
About half the function declarations in mem-pool.h used 'struct mem_pool
*pool', while the other half used 'struct mem_pool *mem_pool'.  Make the
code a bit more consistent by just using 'pool' in preference to
'mem_pool' everywhere.

No behavioral changes included; this is just a mechanical rename (though
a line or two was rewrapped as well).

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2020-08-15 17:37:57 +00:00 committed by Junio C Hamano
parent 44c7e1a7e0
commit f87bf28483
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mem-pool.c
View File

@ -12,11 +12,13 @@
* `insert_after`. If `insert_after` is NULL, then insert block at the * `insert_after`. If `insert_after` is NULL, then insert block at the
* head of the linked list. * head of the linked list.
*/ */
static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t block_alloc, struct mp_block *insert_after) static struct mp_block *mem_pool_alloc_block(struct mem_pool *pool,
size_t block_alloc,
struct mp_block *insert_after)
{ {
struct mp_block *p; struct mp_block *p;
mem_pool->pool_alloc += sizeof(struct mp_block) + block_alloc; pool->pool_alloc += sizeof(struct mp_block) + block_alloc;
p = xmalloc(st_add(sizeof(struct mp_block), block_alloc)); p = xmalloc(st_add(sizeof(struct mp_block), block_alloc));
p->next_free = (char *)p->space; p->next_free = (char *)p->space;
@ -26,8 +28,8 @@ static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t b
p->next_block = insert_after->next_block; p->next_block = insert_after->next_block;
insert_after->next_block = p; insert_after->next_block = p;
} else { } else {
p->next_block = mem_pool->mp_block; p->next_block = pool->mp_block;
mem_pool->mp_block = p; pool->mp_block = p;
} }
return p; return p;
@ -42,11 +44,11 @@ void mem_pool_init(struct mem_pool *pool, size_t initial_size)
mem_pool_alloc_block(pool, initial_size, NULL); mem_pool_alloc_block(pool, initial_size, NULL);
} }
void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory) void mem_pool_discard(struct mem_pool *pool, int invalidate_memory)
{ {
struct mp_block *block, *block_to_free; struct mp_block *block, *block_to_free;
block = mem_pool->mp_block; block = pool->mp_block;
while (block) while (block)
{ {
block_to_free = block; block_to_free = block;
@ -58,11 +60,11 @@ void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory)
free(block_to_free); free(block_to_free);
} }
mem_pool->mp_block = NULL; pool->mp_block = NULL;
mem_pool->pool_alloc = 0; pool->pool_alloc = 0;
} }
void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len) void *mem_pool_alloc(struct mem_pool *pool, size_t len)
{ {
struct mp_block *p = NULL; struct mp_block *p = NULL;
void *r; void *r;
@ -71,15 +73,15 @@ void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len)
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));
if (mem_pool->mp_block && if (pool->mp_block &&
mem_pool->mp_block->end - mem_pool->mp_block->next_free >= len) pool->mp_block->end - pool->mp_block->next_free >= len)
p = mem_pool->mp_block; p = pool->mp_block;
if (!p) { if (!p) {
if (len >= (mem_pool->block_alloc / 2)) if (len >= (pool->block_alloc / 2))
return mem_pool_alloc_block(mem_pool, len, mem_pool->mp_block); return mem_pool_alloc_block(pool, len, pool->mp_block);
p = mem_pool_alloc_block(mem_pool, mem_pool->block_alloc, NULL); p = mem_pool_alloc_block(pool, pool->block_alloc, NULL);
} }
r = p->next_free; r = p->next_free;
@ -87,10 +89,10 @@ void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len)
return r; return r;
} }
void *mem_pool_calloc(struct mem_pool *mem_pool, size_t count, size_t size) void *mem_pool_calloc(struct mem_pool *pool, size_t count, size_t size)
{ {
size_t len = st_mult(count, size); size_t len = st_mult(count, size);
void *r = mem_pool_alloc(mem_pool, len); void *r = mem_pool_alloc(pool, len);
memset(r, 0, len); memset(r, 0, len);
return r; return r;
} }
@ -113,12 +115,12 @@ char *mem_pool_strndup(struct mem_pool *pool, const char *str, size_t len)
return memcpy(ret, str, actual_len); return memcpy(ret, str, actual_len);
} }
int mem_pool_contains(struct mem_pool *mem_pool, void *mem) int mem_pool_contains(struct mem_pool *pool, void *mem)
{ {
struct mp_block *p; struct mp_block *p;
/* Check if memory is allocated in a block */ /* Check if memory is allocated in a block */
for (p = mem_pool->mp_block; p; p = p->next_block) for (p = pool->mp_block; p; p = p->next_block)
if ((mem >= ((void *)p->space)) && if ((mem >= ((void *)p->space)) &&
(mem < ((void *)p->end))) (mem < ((void *)p->end)))
return 1; return 1;

4
mem-pool.h
View File

@ -29,7 +29,7 @@ void mem_pool_init(struct mem_pool *pool, size_t initial_size);
/* /*
* Discard all the memory the memory pool is responsible for. * Discard all the memory the memory pool is responsible for.
*/ */
void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory); void mem_pool_discard(struct mem_pool *pool, int invalidate_memory);
/* /*
* Alloc memory from the mem_pool. * Alloc memory from the mem_pool.
@ -58,6 +58,6 @@ void mem_pool_combine(struct mem_pool *dst, struct mem_pool *src);
* Check if a memory pointed at by 'mem' is part of the range of * Check if a memory pointed at by 'mem' is part of the range of
* memory managed by the specified mem_pool. * memory managed by the specified mem_pool.
*/ */
int mem_pool_contains(struct mem_pool *mem_pool, void *mem); int mem_pool_contains(struct mem_pool *pool, void *mem);
#endif #endif