dynamic accept threshold

diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index 5861bfd096182ef3c9f7630dc5ed0c415bcbdcfd..ab73079a6ab0ab3a5daeac257d1f499d4d62a0ac 100644 (file)
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -110,8 +110,6 @@ typedef intptr_t        ngx_flag_t;
 #define ngx_inline      inline
 #endif
 
-#define NGX_ACCEPT_THRESHOLD   100
-
 #ifndef INADDR_NONE  /* Solaris */
 #define INADDR_NONE  ((unsigned int) -1)
 #endif

diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 39b6515397377c14c5d515b30bf7cf32a530fd9c..379abb9c3fa250b360bca733455642099ec38439 100644 (file)
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -82,7 +82,7 @@ ngx_event_accept(ngx_event_t *ev)
         ngx_atomic_fetch_add(ngx_stat_accepted, 1);
 #endif
 
-        ngx_accept_disabled = NGX_ACCEPT_THRESHOLD
+        ngx_accept_disabled = ngx_cycle->connection_n / 8
                               - ngx_cycle->free_connection_n;
 
         c = ngx_get_connection(s, ev->log);