Mercurial > hg > nginx-quic
changeset 6507:8ee94ecd3a50
Merged implementations of ngx_unix_recv().
There's no real need in two separate implementations,
with and without kqueue support.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Fri, 08 Apr 2016 16:41:45 +0300 |
parents | dc1ae0056a1e |
children | 151fd02a4317 |
files | src/os/unix/ngx_recv.c |
diffstat | 1 files changed, 12 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/unix/ngx_recv.c +++ b/src/os/unix/ngx_recv.c @@ -10,8 +10,6 @@ #include <ngx_event.h> -#if (NGX_HAVE_KQUEUE) - ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size) { @@ -21,6 +19,8 @@ ngx_unix_recv(ngx_connection_t *c, u_cha rev = c->read; +#if (NGX_HAVE_KQUEUE) + if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, "recv: eof:%d, avail:%d, err:%d", @@ -48,6 +48,8 @@ ngx_unix_recv(ngx_connection_t *c, u_cha } } +#endif + do { n = recv(c->fd, buf, size, 0); @@ -58,6 +60,8 @@ ngx_unix_recv(ngx_connection_t *c, u_cha rev->ready = 0; rev->eof = 1; +#if (NGX_HAVE_KQUEUE) + /* * on FreeBSD recv() may return 0 on closed socket * even if kqueue reported about available data @@ -67,11 +71,15 @@ ngx_unix_recv(ngx_connection_t *c, u_cha rev->available = 0; } +#endif + return 0; } if (n > 0) { +#if (NGX_HAVE_KQUEUE) + if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { rev->available -= n; @@ -93,6 +101,8 @@ ngx_unix_recv(ngx_connection_t *c, u_cha return n; } +#endif + if ((size_t) n < size && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) { @@ -124,61 +134,3 @@ ngx_unix_recv(ngx_connection_t *c, u_cha return n; } - -#else /* ! NGX_HAVE_KQUEUE */ - -ssize_t -ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size) -{ - ssize_t n; - ngx_err_t err; - ngx_event_t *rev; - - rev = c->read; - - do { - n = recv(c->fd, buf, size, 0); - - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, - "recv: fd:%d %z of %uz", c->fd, n, size); - - if (n == 0) { - rev->ready = 0; - rev->eof = 1; - return n; - - } else if (n > 0) { - - if ((size_t) n < size - && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) - { - rev->ready = 0; - } - - return n; - } - - err = ngx_socket_errno; - - if (err == NGX_EAGAIN || err == NGX_EINTR) { - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err, - "recv() not ready"); - n = NGX_AGAIN; - - } else { - n = ngx_connection_error(c, err, "recv() failed"); - break; - } - - } while (err == NGX_EINTR); - - rev->ready = 0; - - if (n == NGX_ERROR) { - rev->error = 1; - } - - return n; -} - -#endif /* NGX_HAVE_KQUEUE */