diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2017-06-14 18:13:31 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2017-06-14 18:13:31 +0300 |
| commit | 439e205255267662c04d13c3404937e3324e06a5 (patch) | |
| tree | c76ec9ca2d5db5167ba6a98f83a98cc84517afff | |
| parent | b0b24e8a30d0cd412b9f1a7a67d3030580b6acf6 (diff) | |
| download | nginx-439e205255267662c04d13c3404937e3324e06a5.tar.gz nginx-439e205255267662c04d13c3404937e3324e06a5.zip | |
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.
| -rw-r--r-- | src/core/ngx_resolver.c | 5 | ||||
| -rw-r--r-- | src/core/ngx_resolver.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index a18fd1fde..91f8a5ef3 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -746,6 +746,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, last->next = rn->waiting; rn->waiting = ctx; ctx->state = NGX_AGAIN; + ctx->async = 1; do { ctx->node = rn; @@ -892,6 +893,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx, rn->waiting = ctx; ctx->state = NGX_AGAIN; + ctx->async = 1; do { ctx->node = rn; @@ -1023,6 +1025,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) ctx->next = rn->waiting; rn->waiting = ctx; ctx->state = NGX_AGAIN; + ctx->async = 1; ctx->node = rn; /* unlock addr mutex */ @@ -1119,6 +1122,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx) /* unlock addr mutex */ ctx->state = NGX_AGAIN; + ctx->async = 1; ctx->node = rn; return NGX_OK; @@ -3019,6 +3023,7 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx) srv = cctx->srvs; ctx->count--; + ctx->async |= cctx->async; srv->ctx = NULL; srv->state = cctx->state; diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h index a0d6fc341..6f099b70f 100644 --- a/src/core/ngx_resolver.h +++ b/src/core/ngx_resolver.h @@ -218,7 +218,8 @@ struct ngx_resolver_ctx_s { 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; }; |