diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-05 12:42:36 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-05 12:42:36 +0000 |
| commit | e8f02297bea23cdff09050a3d1add07d1e765933 (patch) | |
| tree | a0f7baa86b26ebde34ccfed77995ba8bd3948858 /src | |
| parent | c68a4cfdc54301d4ac7365d291dbe4af52b1294b (diff) | |
| download | nginx-e8f02297bea23cdff09050a3d1add07d1e765933.tar.gz nginx-e8f02297bea23cdff09050a3d1add07d1e765933.tar.bz2 | |
Merge r4336:
Microoptimization of sendfile(2) usage under FreeBSD.
FreeBSD kernel checks headers/trailers pointer against NULL, not
corresponding count. Passing NULL if there are no headers/trailers
helps to avoid unneeded work in kernel, as well as unexpected 0 bytes
GIO in traces.
Diffstat (limited to 'src')
| -rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 039243e96..8c98f8e38 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -246,9 +246,14 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) } } - hdtr.headers = (struct iovec *) header.elts; + /* + * sendfile() does unneeded work if sf_hdtr's count is 0, + * but corresponding pointer is not NULL + */ + + hdtr.headers = header.nelts ? (struct iovec *) header.elts: NULL; hdtr.hdr_cnt = header.nelts; - hdtr.trailers = (struct iovec *) trailer.elts; + hdtr.trailers = trailer.nelts ? (struct iovec *) trailer.elts: NULL; hdtr.trl_cnt = trailer.nelts; /* |