mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolver: added the "async" flag to resolver context.

Browse Source 
The flag indicates that the resolve handler is called asynchronously after the
resolve function ngx_resolve_name()/ngx_resolve_addr() exited.
This commit is contained in:
Roman Arutyunyan 2017-06-14 18:13:31 +03:00
parent b0b24e8a30
commit 439e205255
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/ngx_resolver.c
View File

@ -746,6 +746,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
last->next = rn->waiting; last->next = rn->waiting;
rn->waiting = ctx; rn->waiting = ctx;
ctx->state = NGX_AGAIN; ctx->state = NGX_AGAIN;
ctx->async = 1;
do { do {
ctx->node = rn; ctx->node = rn;
@ -892,6 +893,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
rn->waiting = ctx; rn->waiting = ctx;
ctx->state = NGX_AGAIN; ctx->state = NGX_AGAIN;
ctx->async = 1;
do { do {
ctx->node = rn; ctx->node = rn;
@ -1023,6 +1025,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
ctx->next = rn->waiting; ctx->next = rn->waiting;
rn->waiting = ctx; rn->waiting = ctx;
ctx->state = NGX_AGAIN; ctx->state = NGX_AGAIN;
ctx->async = 1;
ctx->node = rn; ctx->node = rn;
/* unlock addr mutex */ /* unlock addr mutex */
@ -1119,6 +1122,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
/* unlock addr mutex */ /* unlock addr mutex */
ctx->state = NGX_AGAIN; ctx->state = NGX_AGAIN;
ctx->async = 1;
ctx->node = rn; ctx->node = rn;
return NGX_OK; return NGX_OK;
@ -3019,6 +3023,7 @@ ngx_resolver_srv_names_handler(ngx_resolver_ctx_t *cctx)
srv = cctx->srvs; srv = cctx->srvs;
ctx->count--; ctx->count--;
ctx->async |= cctx->async;
srv->ctx = NULL; srv->ctx = NULL;
srv->state = cctx->state; srv->state = cctx->state;

3
src/core/ngx_resolver.h
View File

@ -218,7 +218,8 @@ struct ngx_resolver_ctx_s {
void *data; void *data;
ngx_msec_t timeout; ngx_msec_t timeout;
ngx_uint_t quick; /* unsigned quick:1; */ unsigned quick:1;
unsigned async:1;
ngx_uint_t recursion; ngx_uint_t recursion;
ngx_event_t *event; ngx_event_t *event;
}; };