Mercurial > hg > nginx
diff src/event/ngx_event_accept.c @ 93:738fe44c70d5
nginx-0.0.1-2003-05-21-17:28:21 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 21 May 2003 13:28:21 +0000 |
parents | 19cc647ecd91 |
children | a23d010f356d |
line wrap: on
line diff
--- a/src/event/ngx_event_accept.c +++ b/src/event/ngx_event_accept.c @@ -65,39 +65,28 @@ void ngx_event_accept(ngx_event_t *ev) return; } - -#if (HAVE_INHERITED_NONBLOCK) + /* set a blocking mode for aio and non-blocking mode for others */ -#if (HAVE_AIO_EVENT) - if ((ngx_event_flags & NGX_HAVE_AIO_EVENT)) { - if (ngx_blocking(s) == -1) { - ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, - ngx_blocking_n " %s failed", ls->addr_text.data); - return; + if (ngx_inherited_nonblocking) { + if ((ngx_event_flags & NGX_USE_AIO_EVENT)) { + if (ngx_blocking(s) == -1) { + ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, + ngx_blocking_n " %s failed", + ls->addr_text.data); + return; + } + } + + } else { + if ((ngx_event_flags & NGX_USE_AIO_EVENT) == 0) { + if (ngx_nonblocking(s) == -1) { + ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, + ngx_nonblocking_n " %s failed", + ls->addr_text.data); + return; + } } } -#endif - -#else /* !HAVE_INHERITED_NONBLOCK */ - -#if (HAVE_AIO_EVENT) - if (!(ngx_event_flags & NGX_HAVE_AIO_EVENT)) { - if (ngx_nonblocking(s) == -1) { - ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, - ngx_nonblocking_n " %s failed", ls->addr_text.data); - return; - } - } -#else - if (ngx_nonblocking(s) == -1) { - ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, - ngx_nonblocking_n " %s failed", ls->addr_text.data); - return; - } -#endif - -#endif /* HAVE_INHERITED_NONBLOCK */ - rev = &ngx_read_events[s]; wev = &ngx_write_events[s]; @@ -130,15 +119,9 @@ void ngx_event_accept(ngx_event_t *ev) c->unexpected_eof = 1; wev->write = 1; -#if (USE_KQUEUE) - wev->ready = 1; -#else if ((ngx_event_flags & NGX_USE_AIO_EVENT) == 0) { wev->ready = 1; } -#endif - - /* STUB ? */ wev->timer = rev->timer = 10000; c->ctx = ls->ctx; c->servers = ls->servers; @@ -174,17 +157,10 @@ void ngx_event_accept(ngx_event_t *ev) ls->handler(c); -#if (USE_KQUEUE) - - ev->available--; - -#elif (HAVE_KQUEUE) - if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { ev->available--; } -#endif } while (ev->available); return;