From 5c797d9e1a30e45c425e3d24a8da199a6a36272a Mon Sep 17 00:00:00 2001 From: chenwei Date: Sat, 9 Dec 2017 14:18:11 +0800 Subject: [PATCH] Using a more friendly name : belong_to_aeds to belong_to_host --- app/nginx-1.11.10/src/core/ngx_connection.c | 4 ++-- app/nginx-1.11.10/src/core/ngx_connection.h | 2 +- app/nginx-1.11.10/src/event/modules/ngx_ff_channel.c | 2 +- app/nginx-1.11.10/src/event/ngx_event.c | 2 +- app/nginx-1.11.10/src/event/ngx_event.h | 6 +++--- app/nginx-1.11.10/src/event/ngx_event_accept.c | 2 +- app/nginx-1.11.10/src/event/ngx_event_posted.h | 2 +- app/nginx-1.11.10/src/event/ngx_event_timer.h | 4 ++-- app/nginx-1.11.10/src/http/ngx_http.c | 2 +- app/nginx-1.11.10/src/mail/ngx_mail.c | 2 +- app/nginx-1.11.10/src/stream/ngx_stream.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/nginx-1.11.10/src/core/ngx_connection.c b/app/nginx-1.11.10/src/core/ngx_connection.c index fd1d366e..45d90e66 100644 --- a/app/nginx-1.11.10/src/core/ngx_connection.c +++ b/app/nginx-1.11.10/src/core/ngx_connection.c @@ -413,7 +413,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) if (ngx_process <= NGX_PROCESS_MASTER) { /* process master, kernel network stack*/ - if (!ls[i].belong_to_aeds) { + if (!ls[i].belong_to_host) { /* We should continue to process the listening socket, if it is not supported by fstack.*/ if (fstack_territory(ls[i].sockaddr->sa_family, ls[i].type, 0)) { @@ -422,7 +422,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) } } else if (NGX_PROCESS_WORKER == ngx_process) { /* process worker, fstack */ - if (ls[i].belong_to_aeds) { + if (ls[i].belong_to_host) { continue; } diff --git a/app/nginx-1.11.10/src/core/ngx_connection.h b/app/nginx-1.11.10/src/core/ngx_connection.h index d8a100a3..766516c6 100644 --- a/app/nginx-1.11.10/src/core/ngx_connection.h +++ b/app/nginx-1.11.10/src/core/ngx_connection.h @@ -88,7 +88,7 @@ struct ngx_listening_s { #endif #if (NGX_HAVE_FSTACK) - unsigned belong_to_aeds:1; + unsigned belong_to_host:1; #endif }; diff --git a/app/nginx-1.11.10/src/event/modules/ngx_ff_channel.c b/app/nginx-1.11.10/src/event/modules/ngx_ff_channel.c index 5e272d4d..983f152b 100644 --- a/app/nginx-1.11.10/src/event/modules/ngx_ff_channel.c +++ b/app/nginx-1.11.10/src/event/modules/ngx_ff_channel.c @@ -567,7 +567,7 @@ ngx_ff_add_channel_event(ngx_cycle_t *cycle, ngx_fd_t fd, rev->channel = 1; wev->channel = 1; - rev->belong_to_aeds = wev->belong_to_aeds = 1; + rev->belong_to_host = wev->belong_to_host = 1; ev = (event == NGX_READ_EVENT) ? rev : wev; ev->handler = handler; diff --git a/app/nginx-1.11.10/src/event/ngx_event.c b/app/nginx-1.11.10/src/event/ngx_event.c index a55672f5..14c9709e 100644 --- a/app/nginx-1.11.10/src/event/ngx_event.c +++ b/app/nginx-1.11.10/src/event/ngx_event.c @@ -783,7 +783,7 @@ ngx_event_process_init(ngx_cycle_t *cycle) #if (NGX_HAVE_FSTACK) /* Note when nginx running on fstack, make sure that add the right fd to kqueue !! */ - c->read->belong_to_aeds = c->write->belong_to_aeds = ls[i].belong_to_aeds; + c->read->belong_to_host = c->write->belong_to_host = ls[i].belong_to_host; #endif #if (NGX_HAVE_DEFERRED_ACCEPT) diff --git a/app/nginx-1.11.10/src/event/ngx_event.h b/app/nginx-1.11.10/src/event/ngx_event.h index 364f5a3a..1c43220a 100644 --- a/app/nginx-1.11.10/src/event/ngx_event.h +++ b/app/nginx-1.11.10/src/event/ngx_event.h @@ -144,7 +144,7 @@ struct ngx_event_s { #endif #if (NGX_HAVE_FSTACK) - unsigned belong_to_aeds:1; + unsigned belong_to_host:1; #endif }; @@ -417,7 +417,7 @@ extern ngx_event_actions_t ngx_event_actions_dy; static inline ngx_int_t ngx_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { - if (1 == ev->belong_to_aeds) { + if (1 == ev->belong_to_host) { return ngx_event_actions_dy.add(ev, event, flags); } else { return ngx_event_actions.add(ev, event, flags); @@ -426,7 +426,7 @@ extern ngx_event_actions_t ngx_event_actions_dy; static inline ngx_int_t ngx_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { - if (1 == ev->belong_to_aeds) { + if (1 == ev->belong_to_host) { return ngx_event_actions_dy.del(ev, event, flags); } else { return ngx_event_actions.del(ev, event, flags); diff --git a/app/nginx-1.11.10/src/event/ngx_event_accept.c b/app/nginx-1.11.10/src/event/ngx_event_accept.c index a8001fac..ca1077a0 100644 --- a/app/nginx-1.11.10/src/event/ngx_event_accept.c +++ b/app/nginx-1.11.10/src/event/ngx_event_accept.c @@ -231,7 +231,7 @@ ngx_event_accept(ngx_event_t *ev) wev = c->write; #if (NGX_HAVE_FSTACK) - rev->belong_to_aeds = wev->belong_to_aeds = ev->belong_to_aeds; + rev->belong_to_host = wev->belong_to_host = ev->belong_to_host; #endif wev->ready = 1; diff --git a/app/nginx-1.11.10/src/event/ngx_event_posted.h b/app/nginx-1.11.10/src/event/ngx_event_posted.h index 5e43e6cf..b9ca53b3 100644 --- a/app/nginx-1.11.10/src/event/ngx_event_posted.h +++ b/app/nginx-1.11.10/src/event/ngx_event_posted.h @@ -19,7 +19,7 @@ \ if (!(ev)->posted) { \ (ev)->posted = 1; \ - if (1 == (ev)->belong_to_aeds) { \ + if (1 == (ev)->belong_to_host) { \ if (q == &ngx_posted_events) { \ ngx_queue_insert_tail( \ &ngx_posted_events_of_aeds, &(ev)->queue); \ diff --git a/app/nginx-1.11.10/src/event/ngx_event_timer.h b/app/nginx-1.11.10/src/event/ngx_event_timer.h index 0e264545..466f3183 100644 --- a/app/nginx-1.11.10/src/event/ngx_event_timer.h +++ b/app/nginx-1.11.10/src/event/ngx_event_timer.h @@ -40,7 +40,7 @@ ngx_event_del_timer(ngx_event_t *ev) #if (NGX_HAVE_FSTACK) - if(ev->belong_to_aeds){ + if(ev->belong_to_host){ ngx_rbtree_delete(&ngx_aeds_timer_rbtree, &ev->timer); } else { ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer); @@ -98,7 +98,7 @@ ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer) #if (NGX_HAVE_FSTACK) - if(ev->belong_to_aeds){ + if(ev->belong_to_host){ ngx_rbtree_insert(&ngx_aeds_timer_rbtree, &ev->timer); } else { ngx_rbtree_insert(&ngx_event_timer_rbtree, &ev->timer); diff --git a/app/nginx-1.11.10/src/http/ngx_http.c b/app/nginx-1.11.10/src/http/ngx_http.c index eea2f420..bac1698b 100644 --- a/app/nginx-1.11.10/src/http/ngx_http.c +++ b/app/nginx-1.11.10/src/http/ngx_http.c @@ -1776,7 +1776,7 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr) #endif #if (NGX_HAVE_FSTACK) - ls->belong_to_aeds = cscf->kernel_network_stack; + ls->belong_to_host = cscf->kernel_network_stack; #endif return ls; diff --git a/app/nginx-1.11.10/src/mail/ngx_mail.c b/app/nginx-1.11.10/src/mail/ngx_mail.c index 021f4c1a..e3bd0f64 100644 --- a/app/nginx-1.11.10/src/mail/ngx_mail.c +++ b/app/nginx-1.11.10/src/mail/ngx_mail.c @@ -346,7 +346,7 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports) #endif #if (NGX_HAVE_FSTACK) - ls->belong_to_aeds = cscf->kernel_network_stack; + ls->belong_to_host = cscf->kernel_network_stack; #endif mport = ngx_palloc(cf->pool, sizeof(ngx_mail_port_t)); diff --git a/app/nginx-1.11.10/src/stream/ngx_stream.c b/app/nginx-1.11.10/src/stream/ngx_stream.c index 24f0e1b7..dcae0905 100644 --- a/app/nginx-1.11.10/src/stream/ngx_stream.c +++ b/app/nginx-1.11.10/src/stream/ngx_stream.c @@ -513,7 +513,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports) #endif #if (NGX_HAVE_FSTACK) - ls->belong_to_aeds = cscf->kernel_network_stack; + ls->belong_to_host = cscf->kernel_network_stack; #endif stport = ngx_palloc(cf->pool, sizeof(ngx_stream_port_t));