diff options
Diffstat (limited to 'src/core/ngx_palloc.c')
| -rw-r--r-- | src/core/ngx_palloc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index d1e7bbdc5..a1f9d59cd 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -20,9 +20,10 @@ ngx_create_pool(size_t size, ngx_log_t *log) p->last = (u_char *) p + sizeof(ngx_pool_t); p->end = (u_char *) p + size; + p->current = p; + p->chain = NULL; p->next = NULL; p->large = NULL; - p->chain = NULL; p->cleanup = NULL; p->log = log; @@ -91,7 +92,7 @@ ngx_palloc(ngx_pool_t *pool, size_t size) && size <= (size_t) (pool->end - (u_char *) pool) - (size_t) ngx_align(sizeof(ngx_pool_t))) { - for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { + for (p = pool->current; /* void */ ; p = p->next) { m = ngx_align(p->last); if ((size_t) (p->end - m) >= size) { @@ -100,7 +101,11 @@ ngx_palloc(ngx_pool_t *pool, size_t size) return m; } - if (n == NULL) { + if ((size_t) (p->end - m) < NGX_ALIGNMENT) { + p->current = p->next; + } + + if (p->next == NULL) { break; } } @@ -112,6 +117,10 @@ ngx_palloc(ngx_pool_t *pool, size_t size) return NULL; } + if (p->current == NULL) { + p->current = n; + } + p->next = n; m = ngx_align(n->last); n->last = m + size; |