From 77d61350a4ac83166555b140e0995c57dcffd696 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Wed, 13 Aug 2014 15:11:45 +0400 Subject: [PATCH] Removed the "complete" variable from various send chain functions. It was made redundant by the previous change, since the "sent" variable is no longer modified. --- src/os/unix/ngx_darwin_sendfile_chain.c | 9 ++------- src/os/unix/ngx_freebsd_sendfile_chain.c | 9 ++------- src/os/unix/ngx_linux_sendfile_chain.c | 9 ++------- src/os/unix/ngx_solaris_sendfilev_chain.c | 9 ++------- src/os/unix/ngx_writev_chain.c | 9 ++------- src/os/win32/ngx_wsasend_chain.c | 8 +------- 6 files changed, 11 insertions(+), 42 deletions(-) diff --git a/src/os/unix/ngx_darwin_sendfile_chain.c b/src/os/unix/ngx_darwin_sendfile_chain.c index b82800e78..67b740bd2 100644 --- a/src/os/unix/ngx_darwin_sendfile_chain.c +++ b/src/os/unix/ngx_darwin_sendfile_chain.c @@ -43,7 +43,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) u_char *prev; off_t size, send, prev_send, aligned, sent, fprev; off_t header_size, file_size; - ngx_uint_t eintr, complete; + ngx_uint_t eintr; ngx_err_t err; ngx_buf_t *file; ngx_array_t header, trailer; @@ -92,7 +92,6 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) file_size = 0; header_size = 0; eintr = 0; - complete = 0; prev_send = send; header.nelts = 0; @@ -311,10 +310,6 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) sent = rc > 0 ? rc : 0; } - if (send - prev_send == sent) { - complete = 1; - } - c->sent += sent; in = ngx_handle_sent_chain(in, sent); @@ -323,7 +318,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) continue; } - if (!complete) { + if (send - prev_send != sent) { wev->ready = 0; return in; } diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 0abbdb349..09f66a2c6 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -45,7 +45,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) u_char *prev; off_t size, send, prev_send, aligned, sent, fprev; size_t header_size, file_size; - ngx_uint_t eintr, eagain, complete; + ngx_uint_t eintr, eagain; ngx_err_t err; ngx_buf_t *file; ngx_array_t header, trailer; @@ -96,7 +96,6 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) file_size = 0; header_size = 0; eintr = 0; - complete = 0; prev_send = send; header.nelts = 0; @@ -362,10 +361,6 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) sent = rc > 0 ? rc : 0; } - if (send - prev_send == sent) { - complete = 1; - } - c->sent += sent; in = ngx_handle_sent_chain(in, sent); @@ -393,7 +388,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) continue; } - if (!complete) { + if (send - prev_send != sent) { wev->ready = 0; return in; } diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c index 3e6fc6dd8..48b5a71a1 100644 --- a/src/os/unix/ngx_linux_sendfile_chain.c +++ b/src/os/unix/ngx_linux_sendfile_chain.c @@ -43,7 +43,7 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) size_t file_size; ngx_err_t err; ngx_buf_t *file; - ngx_uint_t eintr, complete; + ngx_uint_t eintr; ngx_array_t header; ngx_event_t *wev; ngx_chain_t *cl; @@ -79,7 +79,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) file = NULL; file_size = 0; eintr = 0; - complete = 0; prev_send = send; header.nelts = 0; @@ -319,10 +318,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "writev: %O", sent); } - if (send - prev_send == sent) { - complete = 1; - } - c->sent += sent; in = ngx_handle_sent_chain(in, sent); @@ -331,7 +326,7 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) continue; } - if (!complete) { + if (send - prev_send != sent) { wev->ready = 0; return in; } diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c index 76e8728e4..1afe5ac19 100644 --- a/src/os/unix/ngx_solaris_sendfilev_chain.c +++ b/src/os/unix/ngx_solaris_sendfilev_chain.c @@ -51,7 +51,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) off_t size, send, prev_send, aligned, fprev; size_t sent; ssize_t n; - ngx_int_t eintr, complete; + ngx_int_t eintr; ngx_err_t err; sendfilevec_t *sfv, sfvs[NGX_SENDFILEVECS]; ngx_array_t vec; @@ -89,7 +89,6 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) fprev = 0; sfv = NULL; eintr = 0; - complete = 0; sent = 0; prev_send = send; @@ -201,10 +200,6 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, "sendfilev: %z %z", n, sent); - if (send - prev_send == (off_t) sent) { - complete = 1; - } - c->sent += sent; in = ngx_handle_sent_chain(in, sent); @@ -213,7 +208,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) continue; } - if (!complete) { + if (send - prev_send != (off_t) sent) { wev->ready = 0; return in; } diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c index ff16f86e3..8e5021696 100644 --- a/src/os/unix/ngx_writev_chain.c +++ b/src/os/unix/ngx_writev_chain.c @@ -23,7 +23,7 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) u_char *prev; ssize_t n, size, sent; off_t send, prev_send; - ngx_uint_t eintr, complete; + ngx_uint_t eintr; ngx_err_t err; ngx_array_t vec; ngx_chain_t *cl; @@ -64,7 +64,6 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) prev = NULL; iov = NULL; eintr = 0; - complete = 0; prev_send = send; vec.nelts = 0; @@ -137,10 +136,6 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "writev: %z", sent); - if (send - prev_send == sent) { - complete = 1; - } - c->sent += sent; cl = ngx_handle_sent_chain(in, sent); @@ -149,7 +144,7 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) continue; } - if (!complete) { + if (send - prev_send != sent) { wev->ready = 0; return cl; } diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c index a818fe1f9..b559f9fe1 100644 --- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -19,7 +19,6 @@ ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) int rc; u_char *prev; u_long size, sent, send, prev_send; - ngx_uint_t complete; ngx_err_t err; ngx_event_t *wev; ngx_array_t vec; @@ -40,7 +39,6 @@ ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) } send = 0; - complete = 0; /* * WSABUFs must be 4-byte aligned otherwise @@ -113,15 +111,11 @@ ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, "WSASend: fd:%d, s:%ul", c->fd, sent); - if (send - prev_send == sent) { - complete = 1; - } - c->sent += sent; cl = ngx_handle_sent_chain(in, sent); - if (!complete) { + if (send - prev_send != sent) { wev->ready = 0; return cl; }