diff --git a/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c b/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c index 5c2b0034..64ec20a7 100644 --- a/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c +++ b/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c @@ -746,7 +746,7 @@ ngx_ff_start_worker_channel(ngx_cycle_t *cycle, ngx_fd_t fd, return NGX_OK; } -ngx_event_actions_t ngx_event_actions_dy = { +ngx_event_actions_t ngx_ff_host_event_actions = { ngx_ff_epoll_add_event, /* add an event */ ngx_ff_epoll_del_event, /* delete an event */ ngx_ff_epoll_add_event, /* enable an event */ 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 14c9709e..8df48414 100644 --- a/app/nginx-1.11.10/src/event/ngx_event.c +++ b/app/nginx-1.11.10/src/event/ngx_event.c @@ -566,7 +566,7 @@ ngx_timer_signal_handler(int signo) #if (NGX_HAVE_FSTACK) -extern ngx_event_actions_t ngx_event_actions_dy; +extern ngx_event_actions_t ngx_ff_host_event_actions; #endif @@ -636,7 +636,7 @@ ngx_event_process_init(ngx_cycle_t *cycle) } #if (NGX_HAVE_FSTACK) - if (ngx_event_actions_dy.init(cycle, ngx_timer_resolution) != NGX_OK) { + if (ngx_ff_host_event_actions.init(cycle, ngx_timer_resolution) != NGX_OK) { /* fatal */ exit(2); } 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 1c43220a..be7f9e0a 100644 --- a/app/nginx-1.11.10/src/event/ngx_event.h +++ b/app/nginx-1.11.10/src/event/ngx_event.h @@ -203,7 +203,7 @@ extern ngx_event_actions_t ngx_event_actions; extern ngx_uint_t ngx_use_epoll_rdhup; #endif #if (NGX_HAVE_FSTACK) -extern ngx_event_actions_t ngx_event_actions_dy; +extern ngx_event_actions_t ngx_ff_host_event_actions; #endif /* @@ -418,7 +418,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_host) { - return ngx_event_actions_dy.add(ev, event, flags); + return ngx_ff_host_event_actions.add(ev, event, flags); } else { return ngx_event_actions.add(ev, event, flags); } @@ -427,7 +427,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_host) { - return ngx_event_actions_dy.del(ev, event, flags); + return ngx_ff_host_event_actions.del(ev, event, flags); } else { return ngx_event_actions.del(ev, event, flags); }