Mercurial > hg > nginx

diff src/core/ngx_palloc.c @ 3388:d788521e4b0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix r3331: *) now pools are aligned to 16 bytes *) forbidden to set non-aligned pool sizes
author Igor Sysoev <igor@sysoev.ru>
date Thu, 17 Dec 2009 12:25:46 +0000
parents b3aaccf50be2
children 59b99f217c6d
line wrap: on
line diff
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -17,7 +17,7 @@ ngx_create_pool(size_t size, ngx_log_t *
 {
     ngx_pool_t  *p;
 
-    p = ngx_memalign(ngx_min(ngx_pagesize, size), size, log);
+    p = ngx_memalign(NGX_POOL_ALIGNMENT, size, log);
     if (p == NULL) {
         return NULL;
     }
@@ -181,7 +181,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_
 
     psize = (size_t) (pool->d.end - (u_char *) pool);
 
-    m = ngx_memalign(ngx_min(ngx_pagesize, psize), psize, pool->log);
+    m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
     if (m == NULL) {
         return NULL;
     }