mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Used the pwritev() syscall for writing files where possible.

Browse Source 
It is more effective, because it doesn't require a separate lseek().
This commit is contained in:
Valentin Bartenev 2015-11-17 19:01:41 +03:00
parent 906c4462f8
commit d862ae8e68
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
auto/unix
View File

@ -589,6 +589,22 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0);
. auto/feature . auto/feature
# pwritev() was introduced in FreeBSD 6 and Linux 2.6.30, glibc 2.10
ngx_feature="pwritev()"
ngx_feature_name="NGX_HAVE_PWRITEV"
ngx_feature_run=no
ngx_feature_incs='#include <sys/uio.h>'
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n;
vec[0].iov_base = buf;
vec[0].iov_len = 1;
n = pwritev(1, vec, 1, 0);
if (n == -1) return 1"
. auto/feature
ngx_feature="sys_nerr" ngx_feature="sys_nerr"
ngx_feature_name="NGX_SYS_NERR" ngx_feature_name="NGX_SYS_NERR"
ngx_feature_run=value ngx_feature_run=value

38
src/os/unix/ngx_files.c
View File

@ -367,6 +367,38 @@ ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size, off_t offset)
ssize_t n; ssize_t n;
ngx_err_t err; ngx_err_t err;
ngx_log_debug3(NGX_LOG_DEBUG_CORE, file->log, 0,
"writev: %d, %uz, %O", file->fd, size, offset);
#if (NGX_HAVE_PWRITEV)
eintr:
n = pwritev(file->fd, vec->elts, vec->nelts, offset);
if (n == -1) {
err = ngx_errno;
if (err == NGX_EINTR) {
ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
"pwritev() was interrupted");
goto eintr;
}
ngx_log_error(NGX_LOG_CRIT, file->log, err,
"pwritev() \"%s\" failed", file->name.data);
return NGX_ERROR;
}
if ((size_t) n != size) {
ngx_log_error(NGX_LOG_CRIT, file->log, 0,
"pwritev() \"%s\" has written only %z of %uz",
file->name.data, n, size);
return NGX_ERROR;
}
#else
if (file->sys_offset != offset) { if (file->sys_offset != offset) {
if (lseek(file->fd, offset, SEEK_SET) == -1) { if (lseek(file->fd, offset, SEEK_SET) == -1) {
ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
@ -402,10 +434,10 @@ eintr:
return NGX_ERROR; return NGX_ERROR;
} }
ngx_log_debug2(NGX_LOG_DEBUG_CORE, file->log, 0,
"writev: %d, %z", file->fd, n);
file->sys_offset += n; file->sys_offset += n;
#endif
file->offset += n; file->offset += n;
return n; return n;