diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/nginx.c | 3 | ||||
| -rw-r--r-- | src/core/ngx_palloc.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index ff7a9f848..eaae62e4b 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -280,6 +280,9 @@ main(int argc, char *const *argv) init_cycle.log = log; ngx_cycle = &init_cycle; + /* dummy pagesize to create aligned pool */ + ngx_pagesize = 1024; + init_cycle.pool = ngx_create_pool(1024, log); if (init_cycle.pool == NULL) { return 1; diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index fd0476803..ca59f6260 100644 --- 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 *log) { ngx_pool_t *p; - p = ngx_alloc(size, log); + p = ngx_memalign(ngx_pagesize, size, log); if (p == NULL) { return NULL; } @@ -181,7 +181,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size) psize = (size_t) (pool->d.end - (u_char *) pool); - m = ngx_alloc(psize, pool->log); + m = ngx_memalign(ngx_pagesize, psize, pool->log); if (m == NULL) { return NULL; } @@ -219,7 +219,7 @@ ngx_palloc_large(ngx_pool_t *pool, size_t size) ngx_uint_t n; ngx_pool_large_t *large; - p = ngx_alloc(size, pool->log); + p = ngx_memalign(ngx_pagesize, size, pool->log); if (p == NULL) { return NULL; } |