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

add guard code

Browse Source
This commit is contained in:
Igor Sysoev 2007-08-29 11:26:42 +00:00
parent bb3799d89f
commit 7f789168ef
1 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/event/modules/ngx_devpoll_module.c
View File

@ -13,8 +13,9 @@
/* Solaris declarations */ /* Solaris declarations */
#define POLLREMOVE 0x0800 #define POLLREMOVE 0x0800
#define DP_POLL 0xD001 #define DP_POLL 0xD001
#define DP_ISPOLLED 0xD002
struct dvpoll { struct dvpoll {
struct pollfd *dp_fds; struct pollfd *dp_fds;
@ -336,13 +337,15 @@ ngx_int_t
ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
ngx_uint_t flags) ngx_uint_t flags)
{ {
int events, revents; int events, revents, rc;
size_t n; size_t n;
ngx_fd_t fd;
ngx_err_t err; ngx_err_t err;
ngx_int_t i; ngx_int_t i;
ngx_uint_t level; ngx_uint_t level;
ngx_event_t *rev, *wev, **queue; ngx_event_t *rev, *wev, **queue;
ngx_connection_t *c; ngx_connection_t *c;
struct pollfd pfd;
struct dvpoll dvp; struct dvpoll dvp;
/* NGX_TIMER_INFINITE == INFTIM */ /* NGX_TIMER_INFINITE == INFTIM */
@ -407,34 +410,77 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
ngx_mutex_lock(ngx_posted_events_mutex); ngx_mutex_lock(ngx_posted_events_mutex);
for (i = 0; i < events; i++) { for (i = 0; i < events; i++) {
c = ngx_cycle->files[event_list[i].fd];
if (c->fd == -1) { fd = event_list[i].fd;
if (c->read->closed) { revents = event_list[i].revents;
continue;
c = ngx_cycle->files[fd];
if (c == NULL || c->fd == -1) {
pfd.fd = fd;
pfd.events = 0;
pfd.revents = 0;
rc = ioctl(dp, DP_ISPOLLED, &pfd);
switch (rc) {
case -1:
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"ioctl(DP_ISPOLLED) failed for socket %d, event",
fd, revents);
break;
case 0:
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"phantom event %04Xd for closed and removed socket %d",
revents, fd);
break;
default:
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"unexpected event %04Xd for closed and removed socket %d, ",
"ioctl(DP_ISPOLLED) returned rc:%d, fd:%d, event %04Xd",
revents, fd, rc, pfd.fd, pfd.revents);
pfd.fd = fd;
pfd.events = POLLREMOVE;
pfd.revents = 0;
if (write(dp, &pfd, sizeof(struct pollfd))
!= (ssize_t) sizeof(struct pollfd))
{
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"write(/dev/poll) for %d failed, fd");
}
if (close(fd) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"close(%d) failed", fd);
}
break;
} }
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "unexpected event");
continue; continue;
} }
revents = event_list[i].revents;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"devpoll: fd:%d, ev:%04Xd, rev:%04Xd", "devpoll: fd:%d, ev:%04Xd, rev:%04Xd",
event_list[i].fd, event_list[i].events, revents); fd, event_list[i].events, revents);
if (revents & (POLLERR|POLLHUP|POLLNVAL)) { if (revents & (POLLERR|POLLHUP|POLLNVAL)) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"ioctl(DP_POLL) error fd:%d ev:%04Xd rev:%04Xd", "ioctl(DP_POLL) error fd:%d ev:%04Xd rev:%04Xd",
event_list[i].fd, event_list[i].events, revents); fd, event_list[i].events, revents);
} }
if (revents & ~(POLLIN|POLLOUT|POLLERR|POLLHUP|POLLNVAL)) { if (revents & ~(POLLIN|POLLOUT|POLLERR|POLLHUP|POLLNVAL)) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"strange ioctl(DP_POLL) events " "strange ioctl(DP_POLL) events "
"fd:%d ev:%04Xd rev:%04Xd", "fd:%d ev:%04Xd rev:%04Xd",
event_list[i].fd, event_list[i].events, revents); fd, event_list[i].events, revents);
} }
if ((revents & (POLLERR|POLLHUP|POLLNVAL)) if ((revents & (POLLERR|POLLHUP|POLLNVAL))