proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-02 20:52:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2451 from libgit2/rb/round-up-pool-allocations

Browse Source 
Round up pool alloc sizes for alignment
This commit is contained in:
Vicent Marti 2014-07-01 13:26:02 +02:00
commit 1453bd2089
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pool.c
View File

@ -146,7 +146,7 @@ GIT_INLINE(void) pool_remove_page(
void *git_pool_malloc(git_pool *pool, uint32_t items)
{
git_pool_page *scan = pool->open, *prev;
uint32_t size = items * pool->item_size;
uint32_t size = ((items * pool->item_size) + 7) & ~7;
void *ptr = NULL;
pool->has_string_alloc = 0;

10
tests/core/pool.c
View File

@ -38,19 +38,19 @@ void test_core_pool__1(void)
cl_assert(git_pool_malloc(&p, i) != NULL);
/* with fixed page size, allocation must end up with these values */
cl_assert(git_pool__open_pages(&p) == 1);
cl_assert(git_pool__full_pages(&p) == 505);
cl_assert_equal_i(1, git_pool__open_pages(&p));
cl_assert_equal_i(507, git_pool__full_pages(&p));
git_pool_clear(&p);
cl_git_pass(git_pool_init(&p, 1, 4100));
cl_git_pass(git_pool_init(&p, 1, 4120));
for (i = 2010; i > 0; i--)
cl_assert(git_pool_malloc(&p, i) != NULL);
/* with fixed page size, allocation must end up with these values */
cl_assert(git_pool__open_pages(&p) == 1);
cl_assert(git_pool__full_pages(&p) == 492);
cl_assert_equal_i(1, git_pool__open_pages(&p));
cl_assert_equal_i(492, git_pool__full_pages(&p));
git_pool_clear(&p);
}