do not test a pool block space if we can not allocated from the block 4 times

This commit is contained in:
Igor Sysoev 2009-06-05 13:27:12 +00:00
parent 8e5f0acbc2
commit 7f9305cc2c
2 changed files with 4 additions and 1 deletions

View File

@ -25,6 +25,7 @@ ngx_create_pool(size_t size, ngx_log_t *log)
p->d.last = (u_char *) p + sizeof(ngx_pool_t);
p->d.end = (u_char *) p + size;
p->d.next = NULL;
p->d.failed = 0;
size = size - sizeof(ngx_pool_t);
p->max = (size < NGX_MAX_ALLOC_FROM_POOL) ? size : NGX_MAX_ALLOC_FROM_POOL;
@ -189,6 +190,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
new->d.end = m + psize;
new->d.next = NULL;
new->d.failed = 0;
m += sizeof(ngx_pool_data_t);
m = ngx_align_ptr(m, NGX_ALIGNMENT);
@ -197,7 +199,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
current = pool->current;
for (p = current; p->d.next; p = p->d.next) {
if ((size_t) (p->d.end - p->d.last) < NGX_ALIGNMENT) {
if (p->d.failed++ > 4) {
current = p->d.next;
}
}

View File

@ -46,6 +46,7 @@ typedef struct {
u_char *last;
u_char *end;
ngx_pool_t *next;
ngx_uint_t failed;
} ngx_pool_data_t;