Mercurial > hg > nginx
diff src/event/ngx_event_recv.c @ 69:e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 20 Mar 2003 16:09:44 +0000 |
parents | 5a7d1aaa1618 |
children |
line wrap: on
line diff
--- a/src/event/ngx_event_recv.c +++ b/src/event/ngx_event_recv.c @@ -8,18 +8,13 @@ ssize_t ngx_event_recv_core(ngx_connection_t *c, char *buf, size_t size) { - int n; - ngx_err_t err; - ngx_event_t *ev; + ssize_t n; + ngx_err_t err; + ngx_event_t *ev; ev = c->read; - if (ev->timedout) { - ngx_set_socket_errno(NGX_ETIMEDOUT); - ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT, "recv() failed"); - return NGX_ERROR; - } - +/* DEBUG */ #if (HAVE_KQUEUE) if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { ngx_log_debug(c->log, "ngx_event_recv: eof:%d, avail:%d, err:%d" _ @@ -30,54 +25,32 @@ ssize_t ngx_event_recv_core(ngx_connecti #if (USE_KQUEUE) if (ev->eof && ev->available == 0) { - if (ev->error) { - ngx_set_socket_errno(ev->error); - if (ev->error == NGX_ECONNRESET && ev->ignore_econnreset) { - return 0; - } - - ngx_log_error(NGX_LOG_ERR, c->log, ev->error, - "recv() failed"); - return NGX_ERROR; + if (ev->error == 0) { + return 0; } - return 0; - } - -#elif (HAVE_KQUEUE) - - if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { - if (ev->eof && ev->available == 0) { - if (ev->error) { - ngx_set_socket_errno(ev->error); + ngx_set_socket_errno(ev->error); + err = ev->error; + n = -1; - if (ev->error == NGX_ECONNRESET && ev->ignore_econnreset) { - return 0; - } + } else { + n = ngx_recv(c->fd, buf, size, 0); - ngx_log_error(NGX_LOG_ERR, c->log, ev->error, - "recv() failed"); - return NGX_ERROR; - } - - return 0; + if (n == -1) { + err = ngx_socket_errno; } } -#endif - - n = ngx_recv(c->fd, buf, size, 0); + if (n == -1) { + ev->ready = 0; - if (n == -1) { - err = ngx_socket_errno; - - if (ev->error == NGX_ECONNRESET && ev->ignore_econnreset) { + if (err == NGX_ECONNRESET && ev->ignore_econnreset) { return 0; } if (err == NGX_EAGAIN) { - ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returns EAGAIN"); + ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returned EAGAIN"); return NGX_AGAIN; } @@ -85,17 +58,90 @@ ssize_t ngx_event_recv_core(ngx_connecti return NGX_ERROR; } -#if (USE_KQUEUE) + ev->available -= n; + if (ev->available == 0) { + ev->ready = 0; + } - ev->available -= n; + return n; #elif (HAVE_KQUEUE) - if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { - ev->available -= n; + if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) + && ev->eof && ev->available == 0) { + + if (ev->error == 0) { + return 0; + } + + ngx_set_socket_errno(ev->error); + err = ev->error; + n = -1; + + } else { + n = ngx_recv(c->fd, buf, size, 0); +ngx_log_debug(c->log, "ngx_event_recv: read:%d:%d" _ n _ size); + + if (n == -1) { + err = ngx_socket_errno; + } + } + + if (n == -1) { + ev->ready = 0; + + if (err == NGX_ECONNRESET && ev->ignore_econnreset) { + return 0; + } + + if (err == NGX_EAGAIN) { + ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returned EAGAIN"); + return NGX_AGAIN; + } + + ngx_log_error(NGX_LOG_ERR, c->log, err, "recv() failed"); + return NGX_ERROR; } -#endif + if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { + ev->available -= n; + if (ev->available == 0) { + ev->ready = 0; + } + + } else if ((size_t) n < size) { + ev->ready = 0; + } return n; + +#else /* not kqueue */ + + n = ngx_recv(c->fd, buf, size, 0); + + if (n == -1) { + err = ngx_socket_errno; + + ev->ready = 0; + + if (err == NGX_ECONNRESET && ev->ignore_econnreset) { + return 0; + } + + if (err == NGX_EAGAIN) { + ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returned EAGAIN"); + return NGX_AGAIN; + } + + ngx_log_error(NGX_LOG_ERR, c->log, err, "recv() failed"); + return NGX_ERROR; + } + + if ((size_t) n < size) { + ev->ready = 0; + } + + return n; + +#endif }