diff options
author | Igor Sysoev <igor@sysoev.ru> | 2008-05-27 13:37:40 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2008-05-27 13:37:40 +0400 |
commit | 2d951bfa417f0e125708d5dac64f2f0b91610e07 (patch) | |
tree | 0b14f8805c1eb6ba8104c1f377ad17fbc6257f70 /src/core/ngx_palloc.c | |
parent | 626cd7e7be4d40d19e75e0960752c64aebd544d9 (diff) |
*) add ngx_palloc_aligned() to allocate explicitlty aligned memory
*) allows non-aligned memory blocks for small allocations and for odd
length strings on all platforms
*) use ngx_palloc_aligned()
Diffstat (limited to 'src/core/ngx_palloc.c')
-rw-r--r-- | src/core/ngx_palloc.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index 4cf7e8a4b..130c67056 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -99,8 +99,6 @@ ngx_palloc(ngx_pool_t *pool, size_t size) for ( ;; ) { -#if (NGX_HAVE_NONALIGNED) - /* * allow non-aligned memory blocks for small allocations (1, 2, * or 3 bytes) and for odd length strings (struct's have aligned @@ -110,10 +108,7 @@ ngx_palloc(ngx_pool_t *pool, size_t size) if (size < sizeof(int) || (size & 1)) { m = p->last; - } else -#endif - - { + } else { m = ngx_align_ptr(p->last, NGX_ALIGNMENT); } @@ -177,6 +172,17 @@ ngx_palloc(ngx_pool_t *pool, size_t size) } +void * +ngx_palloc_aligned(ngx_pool_t *pool, size_t size) +{ + if (size & 1) { + size++; + } + + return ngx_palloc(pool, size); +} + + ngx_int_t ngx_pfree(ngx_pool_t *pool, void *p) { |