Using new memory pool implementation.

This commit is contained in:
Igor Sysoev
2017-06-20 19:49:17 +03:00
parent c7ab908c19
commit f888a5310c
72 changed files with 350 additions and 1326 deletions

View File

@@ -8,11 +8,11 @@
nxt_array_t *
nxt_array_create(nxt_mem_pool_t *mp, nxt_uint_t n, size_t size)
nxt_array_create(nxt_mp_t *mp, nxt_uint_t n, size_t size)
{
nxt_array_t *array;
array = nxt_mem_alloc(mp, sizeof(nxt_array_t) + n * size);
array = nxt_mp_alloc(mp, sizeof(nxt_array_t) + n * size);
if (nxt_slow_path(array == NULL)) {
return NULL;
@@ -47,7 +47,7 @@ nxt_array_add(nxt_array_t *array)
new_alloc = nalloc + nalloc / 2;
}
p = nxt_mem_alloc(array->mem_pool, array->size * new_alloc);
p = nxt_mp_alloc(array->mem_pool, array->size * new_alloc);
if (nxt_slow_path(p == NULL)) {
return NULL;
@@ -55,6 +55,8 @@ nxt_array_add(nxt_array_t *array)
nxt_memcpy(p, array->elts, array->size * nalloc);
nxt_mp_free(array->mem_pool, array->elts);
array->elts = p;
array->nalloc = new_alloc;
}