Mercurial > hg > nginx
changeset 7081:69f9ee0342db
Slab: fixed initialization on win32.
On Windows, a worker process does not call ngx_slab_init() from
ngx_init_zone_pool(), so ngx_slab_max_size, ngx_slab_exact_size,
and ngx_slab_exact_shift were left uninitialized.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 08 Aug 2017 15:16:01 +0300 |
parents | ac120e797d28 |
children | 74431027af26 |
files | src/core/nginx.c src/core/ngx_slab.c src/core/ngx_slab.h |
diffstat | 3 files changed, 20 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/nginx.c Fri Aug 04 17:03:10 2017 +0300 +++ b/src/core/nginx.c Tue Aug 08 15:16:01 2017 +0300 @@ -273,6 +273,12 @@ return 1; } + /* + * ngx_slab_sizes_init() requires ngx_pagesize set in ngx_os_init() + */ + + ngx_slab_sizes_init(); + if (ngx_add_inherited_sockets(&init_cycle) != NGX_OK) { return 1; }
--- a/src/core/ngx_slab.c Fri Aug 04 17:03:10 2017 +0300 +++ b/src/core/ngx_slab.c Tue Aug 08 15:16:01 2017 +0300 @@ -83,6 +83,19 @@ void +ngx_slab_sizes_init(void) +{ + ngx_uint_t n; + + ngx_slab_max_size = ngx_pagesize / 2; + ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t)); + for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) { + /* void */ + } +} + + +void ngx_slab_init(ngx_slab_pool_t *pool) { u_char *p; @@ -91,16 +104,6 @@ ngx_uint_t i, n, pages; ngx_slab_page_t *slots, *page; - /* STUB */ - if (ngx_slab_max_size == 0) { - ngx_slab_max_size = ngx_pagesize / 2; - ngx_slab_exact_size = ngx_pagesize / (8 * sizeof(uintptr_t)); - for (n = ngx_slab_exact_size; n >>= 1; ngx_slab_exact_shift++) { - /* void */ - } - } - /**/ - pool->min_size = (size_t) 1 << pool->min_shift; slots = ngx_slab_slots(pool);
--- a/src/core/ngx_slab.h Fri Aug 04 17:03:10 2017 +0300 +++ b/src/core/ngx_slab.h Tue Aug 08 15:16:01 2017 +0300 @@ -59,6 +59,7 @@ } ngx_slab_pool_t; +void ngx_slab_sizes_init(void); void ngx_slab_init(ngx_slab_pool_t *pool); void *ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size); void *ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size);