diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-05-18 15:57:29 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-05-18 15:57:29 +0300 |
| commit | e7c914321b3b4fe2aac308ccd473515697a8f942 (patch) | |
| tree | 96d03c4473a4d290e43a3635b7360215b7714df1 /src | |
| parent | b115a46ee6bc07cfde549e618040bfa9e84a8842 (diff) | |
| download | nginx-e7c914321b3b4fe2aac308ccd473515697a8f942.tar.gz nginx-e7c914321b3b4fe2aac308ccd473515697a8f942.tar.bz2 | |
Events: changed ngx_epoll_test_rdhup() to use existing epollfd.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index f7f2c9004..95864164c 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -463,17 +463,9 @@ ngx_epoll_notify_handler(ngx_event_t *ev) static void ngx_epoll_test_rdhup(ngx_cycle_t *cycle) { - int epfd, s[2], events; + int s[2], events; struct epoll_event ee; - epfd = epoll_create(1); - - if (epfd == -1) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - "epoll_create() failed"); - return; - } - if (socketpair(AF_UNIX, SOCK_STREAM, 0, s) == -1) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "socketpair() failed"); @@ -482,7 +474,7 @@ ngx_epoll_test_rdhup(ngx_cycle_t *cycle) ee.events = EPOLLET|EPOLLIN|EPOLLRDHUP; - if (epoll_ctl(epfd, EPOLL_CTL_ADD, s[0], &ee) == -1) { + if (epoll_ctl(ep, EPOLL_CTL_ADD, s[0], &ee) == -1) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "epoll_ctl() failed"); return; @@ -494,7 +486,7 @@ ngx_epoll_test_rdhup(ngx_cycle_t *cycle) return; } - events = epoll_wait(epfd, &ee, 1, 5000); + events = epoll_wait(ep, &ee, 1, 5000); if (events == -1) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, @@ -503,7 +495,6 @@ ngx_epoll_test_rdhup(ngx_cycle_t *cycle) } (void) close(s[0]); - (void) close(epfd); if (events) { ngx_use_epoll_rdhup = ee.events & EPOLLRDHUP; |