[nginx] Removed the "complete" variable from various send chain ...

Valentin Bartenev vbart at nginx.com
Fri Sep 19 22:14:54 UTC 2014


details:   http://hg.nginx.org/nginx/rev/150df089fe47
branches:  
changeset: 5851:150df089fe47
user:      Valentin Bartenev <vbart at nginx.com>
date:      Wed Aug 13 15:11:45 2014 +0400
description:
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.

diffstat:

 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(-)

diffs (236 lines):

diff -r f9c83484d9ce -r 150df089fe47 src/os/unix/ngx_darwin_sendfile_chain.c
--- a/src/os/unix/ngx_darwin_sendfile_chain.c	Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_darwin_sendfile_chain.c	Wed Aug 13 15:11:45 2014 +0400
@@ -43,7 +43,7 @@ ngx_darwin_sendfile_chain(ngx_connection
     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
         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
             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
             continue;
         }
 
-        if (!complete) {
+        if (send - prev_send != sent) {
             wev->ready = 0;
             return in;
         }
diff -r f9c83484d9ce -r 150df089fe47 src/os/unix/ngx_freebsd_sendfile_chain.c
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c	Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c	Wed Aug 13 15:11:45 2014 +0400
@@ -45,7 +45,7 @@ ngx_freebsd_sendfile_chain(ngx_connectio
     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_connectio
         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_connectio
             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_connectio
             continue;
         }
 
-        if (!complete) {
+        if (send - prev_send != sent) {
             wev->ready = 0;
             return in;
         }
diff -r f9c83484d9ce -r 150df089fe47 src/os/unix/ngx_linux_sendfile_chain.c
--- a/src/os/unix/ngx_linux_sendfile_chain.c	Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_linux_sendfile_chain.c	Wed Aug 13 15:11:45 2014 +0400
@@ -43,7 +43,7 @@ ngx_linux_sendfile_chain(ngx_connection_
     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_
         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_
             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_
             continue;
         }
 
-        if (!complete) {
+        if (send - prev_send != sent) {
             wev->ready = 0;
             return in;
         }
diff -r f9c83484d9ce -r 150df089fe47 src/os/unix/ngx_solaris_sendfilev_chain.c
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c	Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_solaris_sendfilev_chain.c	Wed Aug 13 15:11:45 2014 +0400
@@ -51,7 +51,7 @@ ngx_solaris_sendfilev_chain(ngx_connecti
     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_connecti
         fprev = 0;
         sfv = NULL;
         eintr = 0;
-        complete = 0;
         sent = 0;
         prev_send = send;
 
@@ -201,10 +200,6 @@ ngx_solaris_sendfilev_chain(ngx_connecti
         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_connecti
             continue;
         }
 
-        if (!complete) {
+        if (send - prev_send != (off_t) sent) {
             wev->ready = 0;
             return in;
         }
diff -r f9c83484d9ce -r 150df089fe47 src/os/unix/ngx_writev_chain.c
--- a/src/os/unix/ngx_writev_chain.c	Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_writev_chain.c	Wed Aug 13 15:11:45 2014 +0400
@@ -23,7 +23,7 @@ ngx_writev_chain(ngx_connection_t *c, ng
     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, ng
         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, ng
 
         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, ng
             continue;
         }
 
-        if (!complete) {
+        if (send - prev_send != sent) {
             wev->ready = 0;
             return cl;
         }
diff -r f9c83484d9ce -r 150df089fe47 src/os/win32/ngx_wsasend_chain.c
--- a/src/os/win32/ngx_wsasend_chain.c	Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/win32/ngx_wsasend_chain.c	Wed Aug 13 15:11:45 2014 +0400
@@ -19,7 +19,6 @@ ngx_wsasend_chain(ngx_connection_t *c, n
     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, n
     }
 
     send = 0;
-    complete = 0;
 
     /*
      * WSABUFs must be 4-byte aligned otherwise
@@ -113,15 +111,11 @@ ngx_wsasend_chain(ngx_connection_t *c, n
         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;
         }



More information about the nginx-devel mailing list