mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-09 02:42:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved file writev() handling code to a separate function.

Browse Source 
No functional changes.
This commit is contained in:
Valentin Bartenev 2015-11-17 19:01:41 +03:00
parent a9e62b625b
commit 906c4462f8
1 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,9 @@
static void ngx_thread_read_handler(void *data, ngx_log_t *log); static void ngx_thread_read_handler(void *data, ngx_log_t *log);
#endif #endif
static ssize_t ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size,
off_t offset);
#if (NGX_HAVE_FILE_AIO) #if (NGX_HAVE_FILE_AIO)
@ -282,7 +285,6 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
u_char *prev; u_char *prev;
size_t size; size_t size;
ssize_t total, n; ssize_t total, n;
ngx_err_t err;
ngx_array_t vec; ngx_array_t vec;
struct iovec *iov, iovs[NGX_IOVS]; struct iovec *iov, iovs[NGX_IOVS];
@ -344,46 +346,12 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
return total + n; return total + n;
} }
if (file->sys_offset != offset) { n = ngx_writev_file(file, &vec, size, offset);
if (lseek(file->fd, offset, SEEK_SET) == -1) {
ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
"lseek() \"%s\" failed", file->name.data);
return NGX_ERROR;
}
file->sys_offset = offset; if (n == NGX_ERROR) {
return n;
} }
eintr:
n = writev(file->fd, vec.elts, vec.nelts);
if (n == -1) {
err = ngx_errno;
if (err == NGX_EINTR) {
ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
"writev() was interrupted");
goto eintr;
}
ngx_log_error(NGX_LOG_CRIT, file->log, err,
"writev() \"%s\" failed", file->name.data);
return NGX_ERROR;
}
if ((size_t) n != size) {
ngx_log_error(NGX_LOG_CRIT, file->log, 0,
"writev() \"%s\" has written only %z of %uz",
file->name.data, n, size);
return NGX_ERROR;
}
ngx_log_debug2(NGX_LOG_DEBUG_CORE, file->log, 0,
"writev: %d, %z", file->fd, n);
file->sys_offset += n;
file->offset += n;
offset += n; offset += n;
total += n; total += n;
@ -393,6 +361,57 @@ eintr:
} }
static ssize_t
ngx_writev_file(ngx_file_t *file, ngx_array_t *vec, size_t size, off_t offset)
{
ssize_t n;
ngx_err_t err;
if (file->sys_offset != offset) {
if (lseek(file->fd, offset, SEEK_SET) == -1) {
ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
"lseek() \"%s\" failed", file->name.data);
return NGX_ERROR;
}
file->sys_offset = offset;
}
eintr:
n = writev(file->fd, vec->elts, vec->nelts);
if (n == -1) {
err = ngx_errno;
if (err == NGX_EINTR) {
ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
"writev() was interrupted");
goto eintr;
}
ngx_log_error(NGX_LOG_CRIT, file->log, err,
"writev() \"%s\" failed", file->name.data);
return NGX_ERROR;
}
if ((size_t) n != size) {
ngx_log_error(NGX_LOG_CRIT, file->log, 0,
"writev() \"%s\" has written only %z of %uz",
file->name.data, n, size);
return NGX_ERROR;
}
ngx_log_debug2(NGX_LOG_DEBUG_CORE, file->log, 0,
"writev: %d, %z", file->fd, n);
file->sys_offset += n;
file->offset += n;
return n;
}
ngx_int_t ngx_int_t
ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s) ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s)
{ {