# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1245055390 0
# Node ID 7d8667499ddc64dbfb65137c9e3f93005114694f
# Parent  b002fa81b00de95c5111322ff2d4b24aaad99968
merge r2889, r2918, and r2921:

fix a pool growing and CPU usage for multi-requests keepalive connections:

*) keepalive_requests
*) try to reuse last 4 free large allocation links
*) do not test a pool block space if we can not allocated from
   the block 4 times

diff -r b002fa81b00d -r 7d8667499ddc src/core/ngx_connection.h
--- a/src/core/ngx_connection.h	Mon Jun 15 08:36:30 2009 +0000
+++ b/src/core/ngx_connection.h	Mon Jun 15 08:43:10 2009 +0000
@@ -135,6 +135,8 @@
 
     ngx_atomic_uint_t   number;
 
+    ngx_uint_t          requests;
+
     unsigned            buffered:8;
 
     unsigned            log_error:3;     /* ngx_connection_log_error_e */
diff -r b002fa81b00d -r 7d8667499ddc src/core/ngx_palloc.c
--- a/src/core/ngx_palloc.c	Mon Jun 15 08:36:30 2009 +0000
+++ b/src/core/ngx_palloc.c	Mon Jun 15 08:43:10 2009 +0000
@@ -25,6 +25,7 @@
     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 @@
 
     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 @@
     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;
         }
     }
@@ -214,6 +216,7 @@
 ngx_palloc_large(ngx_pool_t *pool, size_t size)
 {
     void              *p;
+    ngx_uint_t         n;
     ngx_pool_large_t  *large;
 
     p = ngx_alloc(size, pool->log);
@@ -221,6 +224,19 @@
         return NULL;
     }
 
+    n = 0;
+
+    for (large = pool->large; large; large = large->next) {
+        if (large->alloc == NULL) {
+            large->alloc = p;
+            return p;
+        }
+
+        if (n++ > 3) {
+            break;
+        }
+    }
+
     large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
     if (large == NULL) {
         ngx_free(p);
diff -r b002fa81b00d -r 7d8667499ddc src/core/ngx_palloc.h
--- a/src/core/ngx_palloc.h	Mon Jun 15 08:36:30 2009 +0000
+++ b/src/core/ngx_palloc.h	Mon Jun 15 08:43:10 2009 +0000
@@ -46,6 +46,7 @@
     u_char               *last;
     u_char               *end;
     ngx_pool_t           *next;
+    ngx_uint_t            failed;
 } ngx_pool_data_t;
 
 
diff -r b002fa81b00d -r 7d8667499ddc src/http/ngx_http_core_module.c
--- a/src/http/ngx_http_core_module.c	Mon Jun 15 08:36:30 2009 +0000
+++ b/src/http/ngx_http_core_module.c	Mon Jun 15 08:43:10 2009 +0000
@@ -440,6 +440,13 @@
       0,
       NULL },
 
+    { ngx_string("keepalive_requests"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_core_loc_conf_t, keepalive_requests),
+      NULL },
+
     { ngx_string("satisfy"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_enum_slot,
@@ -1326,8 +1333,13 @@
 
     r->request_body_in_single_buf = clcf->client_body_in_single_buffer;
 
-    if (r->keepalive && clcf->keepalive_timeout == 0) {
-        r->keepalive = 0;
+    if (r->keepalive) {
+        if (clcf->keepalive_timeout == 0) {
+            r->keepalive = 0;
+
+        } else if (r->connection->requests >= clcf->keepalive_requests) {
+            r->keepalive = 0;
+        }
     }
 
     if (!clcf->tcp_nopush) {
@@ -2914,6 +2926,7 @@
     lcf->limit_rate = NGX_CONF_UNSET_SIZE;
     lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
     lcf->keepalive_header = NGX_CONF_UNSET;
+    lcf->keepalive_requests = NGX_CONF_UNSET_UINT;
     lcf->lingering_time = NGX_CONF_UNSET_MSEC;
     lcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
     lcf->resolver_timeout = NGX_CONF_UNSET_MSEC;
@@ -3114,6 +3127,8 @@
                               prev->keepalive_timeout, 75000);
     ngx_conf_merge_sec_value(conf->keepalive_header,
                               prev->keepalive_header, 0);
+    ngx_conf_merge_uint_value(conf->keepalive_requests,
+                              prev->keepalive_requests, 100);
     ngx_conf_merge_msec_value(conf->lingering_time,
                               prev->lingering_time, 30000);
     ngx_conf_merge_msec_value(conf->lingering_timeout,
diff -r b002fa81b00d -r 7d8667499ddc src/http/ngx_http_core_module.h
--- a/src/http/ngx_http_core_module.h	Mon Jun 15 08:36:30 2009 +0000
+++ b/src/http/ngx_http_core_module.h	Mon Jun 15 08:43:10 2009 +0000
@@ -337,6 +337,7 @@
 
     time_t        keepalive_header;        /* keepalive_timeout */
 
+    ngx_uint_t    keepalive_requests;      /* keepalive_requests */
     ngx_uint_t    satisfy;                 /* satisfy */
     ngx_uint_t    if_modified_since;       /* if_modified_since */
     ngx_uint_t    client_body_in_file_only; /* client_body_in_file_only */
diff -r b002fa81b00d -r 7d8667499ddc src/http/ngx_http_request.c
--- a/src/http/ngx_http_request.c	Mon Jun 15 08:36:30 2009 +0000
+++ b/src/http/ngx_http_request.c	Mon Jun 15 08:43:10 2009 +0000
@@ -259,6 +259,8 @@
         return;
     }
 
+    c->requests++;
+
     hc = c->data;
 
     if (hc == NULL) {