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

Events: close descriptors on errors in ngx_epoll_test_rdhup().

Browse Source
This commit is contained in:
Maxim Dounin 2016-05-18 15:57:30 +03:00
parent e7c914321b
commit ce9ff81b32
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/event/modules/ngx_epoll_module.c
View File

@ -477,25 +477,26 @@ ngx_epoll_test_rdhup(ngx_cycle_t *cycle)
if (epoll_ctl(ep, 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, ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"epoll_ctl() failed"); "epoll_ctl() failed");
return; goto failed;
} }
if (close(s[1]) == -1) { if (close(s[1]) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"close() failed"); "close() failed");
return; s[1] = -1;
goto failed;
} }
s[1] = -1;
events = epoll_wait(ep, &ee, 1, 5000); events = epoll_wait(ep, &ee, 1, 5000);
if (events == -1) { if (events == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"epoll_wait() failed"); "epoll_wait() failed");
return; goto failed;
} }
(void) close(s[0]);
if (events) { if (events) {
ngx_use_epoll_rdhup = ee.events & EPOLLRDHUP; ngx_use_epoll_rdhup = ee.events & EPOLLRDHUP;
@ -507,6 +508,18 @@ ngx_epoll_test_rdhup(ngx_cycle_t *cycle)
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"testing the EPOLLRDHUP flag: %s", "testing the EPOLLRDHUP flag: %s",
ngx_use_epoll_rdhup ? "success" : "fail"); ngx_use_epoll_rdhup ? "success" : "fail");
failed:
if (s[1] != -1 && close(s[1]) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"close() failed");
}
if (close(s[0]) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"close() failed");
}
} }
#endif #endif