]> git.kaiwu.me - nginx.git/commitdiff
Added cycle parameter to ngx_drain_connections().
authorMaxim Dounin <mdounin@mdounin.ru>
Fri, 20 Jan 2017 11:03:19 +0000 (14:03 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Fri, 20 Jan 2017 11:03:19 +0000 (14:03 +0300)
No functional changes, mostly style.

src/core/ngx_connection.c

index a789d8c5132bdbed1312dd1c0f2034339f7a60a9..c43163f182ded5ef6a7612008dddf156b82c1acd 100644 (file)
@@ -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_log_t *log)
     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 *c, ngx_uint_t reusable)
 
 
 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,