comparison src/core/ngx_palloc.h @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 2da4537168f8
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
17 * On Windows NT it decreases a number of locked pages in a kernel. 17 * On Windows NT it decreases a number of locked pages in a kernel.
18 */ 18 */
19 #define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1) 19 #define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1)
20 20
21 #define NGX_DEFAULT_POOL_SIZE (16 * 1024) 21 #define NGX_DEFAULT_POOL_SIZE (16 * 1024)
22
23 #define NGX_POOL_ALIGNMENT 16
22 #define NGX_MIN_POOL_SIZE \ 24 #define NGX_MIN_POOL_SIZE \
23 (sizeof(ngx_pool_t) + 2 * sizeof(ngx_pool_large_t)) 25 ngx_align((sizeof(ngx_pool_t) + 2 * sizeof(ngx_pool_large_t)), \
26 NGX_POOL_ALIGNMENT)
24 27
25 28
26 typedef void (*ngx_pool_cleanup_pt)(void *data); 29 typedef void (*ngx_pool_cleanup_pt)(void *data);
27 30
28 typedef struct ngx_pool_cleanup_s ngx_pool_cleanup_t; 31 typedef struct ngx_pool_cleanup_s ngx_pool_cleanup_t;