[nginx] Added cycle parameter to ngx_drain_connections().

Maxim Dounin mdounin at mdounin.ru
Fri Jan 20 11:03:54 UTC 2017


details:   http://hg.nginx.org/nginx/rev/6ed0922d316b
branches:  
changeset: 6872:6ed0922d316b
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Fri Jan 20 14:03:19 2017 +0300
description:
Added cycle parameter to ngx_drain_connections().

No functional changes, mostly style.

diffstat:

 src/core/ngx_connection.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (43 lines):

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -13,7 +13,7 @@
 ngx_os_io_t  ngx_io;
 
 
-static void ngx_drain_connections(void);
+static void ngx_drain_connections(ngx_cycle_t *cycle);
 
 
 ngx_listening_t *
@@ -1046,7 +1046,7 @@ ngx_get_connection(ngx_socket_t s, ngx_l
     c = ngx_cycle->free_connections;
 
     if (c == NULL) {
-        ngx_drain_connections();
+        ngx_drain_connections((ngx_cycle_t *) ngx_cycle);
         c = ngx_cycle->free_connections;
     }
 
@@ -1226,18 +1226,18 @@ ngx_reusable_connection(ngx_connection_t
 
 
 static void
-ngx_drain_connections(void)
+ngx_drain_connections(ngx_cycle_t *cycle)
 {
     ngx_int_t          i;
     ngx_queue_t       *q;
     ngx_connection_t  *c;
 
     for (i = 0; i < 32; i++) {
-        if (ngx_queue_empty(&ngx_cycle->reusable_connections_queue)) {
+        if (ngx_queue_empty(&cycle->reusable_connections_queue)) {
             break;
         }
 
-        q = ngx_queue_last(&ngx_cycle->reusable_connections_queue);
+        q = ngx_queue_last(&cycle->reusable_connections_queue);
         c = ngx_queue_data(q, ngx_connection_t, queue);
 
         ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0,


More information about the nginx-devel mailing list