Mercurial > hg > nginx

changeset 7040:d49b74a683b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolver: added the "async" flag to resolver context. The flag indicates that the resolve handler is called asynchronously after the resolve function ngx_resolve_name()/ngx_resolve_addr() exited.
author Roman Arutyunyan <arut@nginx.com>
date Wed, 14 Jun 2017 18:13:31 +0300
parents a39bc74873fa
children 6169dbad37d8
files src/core/ngx_resolver.c src/core/ngx_resolver.h
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_resolver.c	Mon Jun 19 14:25:42 2017 +0300
+++ b/src/core/ngx_resolver.c	Wed Jun 14 18:13:31 2017 +0300
@@ -746,6 +746,7 @@
             last->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
+            ctx->async = 1;
 
             do {
                 ctx->node = rn;
@@ -892,6 +893,7 @@
     rn->waiting = ctx;
 
     ctx->state = NGX_AGAIN;
+    ctx->async = 1;
 
     do {
         ctx->node = rn;
@@ -1023,6 +1025,7 @@
             ctx->next = rn->waiting;
             rn->waiting = ctx;
             ctx->state = NGX_AGAIN;
+            ctx->async = 1;
             ctx->node = rn;
 
             /* unlock addr mutex */
@@ -1119,6 +1122,7 @@
     /* unlock addr mutex */
 
     ctx->state = NGX_AGAIN;
+    ctx->async = 1;
     ctx->node = rn;
 
     return NGX_OK;
@@ -3019,6 +3023,7 @@
     srv = cctx->srvs;
 
     ctx->count--;
+    ctx->async |= cctx->async;
 
     srv->ctx = NULL;
     srv->state = cctx->state;
--- a/src/core/ngx_resolver.h	Mon Jun 19 14:25:42 2017 +0300
+++ b/src/core/ngx_resolver.h	Wed Jun 14 18:13:31 2017 +0300
@@ -218,7 +218,8 @@
     void                     *data;
     ngx_msec_t                timeout;
 
-    ngx_uint_t                quick;  /* unsigned  quick:1; */
+    unsigned                  quick:1;
+    unsigned                  async:1;
     ngx_uint_t                recursion;
     ngx_event_t              *event;
 };