mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 17:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merged conditions in the ngx_*_sendfile_chain() functions.

Browse Source 
No functional changes.
This commit is contained in:
Valentin Bartenev 2014-08-13 15:11:45 +04:00
parent d85d459bb2
commit 79ddab189f
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/os/unix/ngx_darwin_sendfile_chain.c
View File

@ -75,8 +75,6 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
trailer.nalloc = NGX_IOVS_PREALLOCATE; trailer.nalloc = NGX_IOVS_PREALLOCATE;
for ( ;; ) { for ( ;; ) {
file = NULL;
file_size = 0;
eintr = 0; eintr = 0;
prev_send = send; prev_send = send;
@ -98,23 +96,22 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
file_size = ngx_chain_coalesce_file(&cl, limit - send); file_size = ngx_chain_coalesce_file(&cl, limit - send);
send += file_size; send += file_size;
}
if (file && header.count == 0) { if (header.count == 0) {
/* create the trailer iovec and coalesce the neighbouring bufs */ /*
* create the trailer iovec and coalesce the neighbouring bufs
*/
cl = ngx_output_chain_to_iovec(&trailer, cl, limit - send, c->log); cl = ngx_output_chain_to_iovec(&trailer, cl, limit - send, c->log);
if (cl == NGX_CHAIN_ERROR) { if (cl == NGX_CHAIN_ERROR) {
return NGX_CHAIN_ERROR; return NGX_CHAIN_ERROR;
}
send += trailer.size;
} }
send += trailer.size;
}
if (file) {
/* /*
* sendfile() returns EINVAL if sf_hdtr's count is 0, * sendfile() returns EINVAL if sf_hdtr's count is 0,
* but corresponding pointer is not NULL * but corresponding pointer is not NULL

9
src/os/unix/ngx_freebsd_sendfile_chain.c
View File

@ -79,8 +79,6 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
trailer.nalloc = NGX_IOVS_PREALLOCATE; trailer.nalloc = NGX_IOVS_PREALLOCATE;
for ( ;; ) { for ( ;; ) {
file = NULL;
file_size = 0;
eintr = 0; eintr = 0;
prev_send = send; prev_send = send;
@ -102,10 +100,6 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send); file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send);
send += file_size; send += file_size;
}
if (file) {
/* create the trailer iovec and coalesce the neighbouring bufs */ /* create the trailer iovec and coalesce the neighbouring bufs */
@ -116,9 +110,6 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
} }
send += trailer.size; send += trailer.size;
}
if (file) {
if (ngx_freebsd_use_tcp_nopush if (ngx_freebsd_use_tcp_nopush
&& c->tcp_nopush == NGX_TCP_NOPUSH_UNSET) && c->tcp_nopush == NGX_TCP_NOPUSH_UNSET)

5
src/os/unix/ngx_linux_sendfile_chain.c
View File

@ -66,8 +66,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
header.nalloc = NGX_IOVS_PREALLOCATE; header.nalloc = NGX_IOVS_PREALLOCATE;
for ( ;; ) { for ( ;; ) {
file = NULL;
file_size = 0;
eintr = 0; eintr = 0;
prev_send = send; prev_send = send;
@ -156,9 +154,6 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send); file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send);
send += file_size; send += file_size;
}
if (file) {
#if 1 #if 1
if (file_size == 0) { if (file_size == 0) {
ngx_debug_point(); ngx_debug_point();