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

Merged implementations of ngx_unix_recv().

Browse Source 
There's no real need in two separate implementations,
with and without kqueue support.
This commit is contained in:
Valentin Bartenev 2016-04-08 16:41:45 +03:00
parent 900ef17c47
commit dbabc66b68
1 changed files with 11 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/os/unix/ngx_recv.c
View File

@ -10,8 +10,6 @@
#include <ngx_event.h> #include <ngx_event.h>
#if (NGX_HAVE_KQUEUE)
ssize_t ssize_t
ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size) 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_char *buf, size_t size)
rev = c->read; rev = c->read;
#if (NGX_HAVE_KQUEUE)
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"recv: eof:%d, avail:%d, err:%d", "recv: eof:%d, avail:%d, err:%d",
@ -48,6 +48,8 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
} }
} }
#endif
do { do {
n = recv(c->fd, buf, size, 0); n = recv(c->fd, buf, size, 0);
@ -58,6 +60,8 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev->ready = 0; rev->ready = 0;
rev->eof = 1; rev->eof = 1;
#if (NGX_HAVE_KQUEUE)
/* /*
* on FreeBSD recv() may return 0 on closed socket * on FreeBSD recv() may return 0 on closed socket
* even if kqueue reported about available data * even if kqueue reported about available data
@ -67,11 +71,15 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev->available = 0; rev->available = 0;
} }
#endif
return 0; return 0;
} }
if (n > 0) { if (n > 0) {
#if (NGX_HAVE_KQUEUE)
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
rev->available -= n; rev->available -= n;
@ -93,61 +101,7 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
return n; return n;
} }
if ((size_t) n < size #endif
&& !(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;
}
#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 if ((size_t) n < size
&& !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
@ -180,5 +134,3 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
return n; return n;
} }
#endif /* NGX_HAVE_KQUEUE */