details: http://hg.nginx.org/nginx/rev/43512a33e8f2
branches:
changeset: 5852:43512a33e8f2
user: Valentin Bartenev <vbart@nginx.com>
date: Wed Aug 13 15:11:45 2014 +0400
description:
Merged implementations of ngx_readv_chain().

There's no real need in two separate implementations,
with and without kqueue support.

diffstat:

src/os/unix/ngx_readv_chain.c | 106 +++--------------------------------------
1 files changed, 9 insertions(+), 97 deletions(-)

diffs (148 lines):

diff -r 150df089fe47 -r 43512a33e8f2 src/os/unix/ngx_readv_chain.c
--- a/src/os/unix/ngx_readv_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_readv_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -17,8 +17,6 @@
#endif


-#if (NGX_HAVE_KQUEUE)
-
ssize_t
ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
{
@@ -31,6 +29,8 @@ ngx_readv_chain(ngx_connection_t *c, ngx

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,
"readv: eof:%d, avail:%d, err:%d",
@@ -58,6 +58,8 @@ ngx_readv_chain(ngx_connection_t *c, ngx
}
}

+#endif
+
prev = NULL;
iov = NULL;
size = 0;
@@ -102,6 +104,9 @@ ngx_readv_chain(ngx_connection_t *c, ngx
n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);

if (n >= 0) {
+
+#if (NGX_HAVE_KQUEUE)
+
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
rev->available -= n;

@@ -141,6 +146,8 @@ ngx_readv_chain(ngx_connection_t *c, ngx
return n;
}

+#endif /* NGX_HAVE_KQUEUE */
+
if (n < size && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) {
rev->ready = 0;
}
@@ -174,98 +181,3 @@ ngx_readv_chain(ngx_connection_t *c, ngx

return n;
}
-
-#else /* ! NGX_HAVE_KQUEUE */
-
-ssize_t
-ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
-{
- u_char *prev;
- ssize_t n, size;
- ngx_err_t err;
- ngx_array_t vec;
- ngx_event_t *rev;
- struct iovec *iov, iovs[NGX_IOVS];
-
- prev = NULL;
- iov = NULL;
- size = 0;
-
- vec.elts = iovs;
- vec.nelts = 0;
- vec.size = sizeof(struct iovec);
- vec.nalloc = NGX_IOVS;
- vec.pool = c->pool;
-
- /* coalesce the neighbouring bufs */
-
- while (chain) {
- if (prev == chain->buf->last) {
- iov->iov_len += chain->buf->end - chain->buf->last;
-
- } else {
- if (vec.nelts >= IOV_MAX) {
- break;
- }
-
- iov = ngx_array_push(&vec);
- if (iov == NULL) {
- return NGX_ERROR;
- }
-
- iov->iov_base = (void *) chain->buf->last;
- iov->iov_len = chain->buf->end - chain->buf->last;
- }
-
- size += chain->buf->end - chain->buf->last;
- prev = chain->buf->end;
- chain = chain->next;
- }
-
- ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "readv: %d:%d", vec.nelts, iov->iov_len);
-
- rev = c->read;
-
- do {
- n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);
-
- if (n == 0) {
- rev->ready = 0;
- rev->eof = 1;
-
- return n;
-
- } else if (n > 0) {
-
- if (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,
- "readv() not ready");
- n = NGX_AGAIN;
-
- } else {
- n = ngx_connection_error(c, err, "readv() failed");
- break;
- }
-
- } while (err == NGX_EINTR);
-
- rev->ready = 0;
-
- if (n == NGX_ERROR) {
- c->read->error = 1;
- }
-
- return n;
-}
-
-#endif /* NGX_HAVE_KQUEUE */

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel