mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-02 11:49:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolver: canceled resend timer on empty resend queues.

Browse Source 
This is specifically useful on graceful shutdown.
This commit is contained in:
Sergey Kandaurov 2015-06-17 17:57:34 +03:00
parent 58957fa3fc
commit f470cd2b89
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/ngx_resolver.c
View File

@ -71,6 +71,7 @@ static ngx_int_t ngx_resolver_create_addr_query(ngx_resolver_node_t *rn,
static void ngx_resolver_resend_handler(ngx_event_t *ev); static void ngx_resolver_resend_handler(ngx_event_t *ev);
static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, static time_t ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree,
ngx_queue_t *queue); ngx_queue_t *queue);
static ngx_uint_t ngx_resolver_resend_empty(ngx_resolver_t *r);
static void ngx_resolver_read_response(ngx_event_t *rev); static void ngx_resolver_read_response(ngx_event_t *rev);
static void ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, static void ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf,
size_t n); size_t n);
@ -463,6 +464,10 @@ done:
ngx_resolver_free_locked(r, ctx); ngx_resolver_free_locked(r, ctx);
/* unlock alloc mutex */ /* unlock alloc mutex */
if (r->event->timer_set && ngx_resolver_resend_empty(r)) {
ngx_del_timer(r->event);
}
} }
@ -1016,6 +1021,10 @@ done:
ngx_resolver_free_locked(r, ctx); ngx_resolver_free_locked(r, ctx);
/* unlock alloc mutex */ /* unlock alloc mutex */
if (r->event->timer_set && ngx_resolver_resend_empty(r)) {
ngx_del_timer(r->event);
}
} }
@ -1225,6 +1234,17 @@ ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, ngx_queue_t *queue)
} }
static ngx_uint_t
ngx_resolver_resend_empty(ngx_resolver_t *r)
{
return ngx_queue_empty(&r->name_resend_queue)
#if (NGX_HAVE_INET6)
&& ngx_queue_empty(&r->addr6_resend_queue)
#endif
&& ngx_queue_empty(&r->addr_resend_queue);
}
static void static void
ngx_resolver_read_response(ngx_event_t *rev) ngx_resolver_read_response(ngx_event_t *rev)
{ {