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

Handled EINTR from write() and pwrite() syscalls.

Browse Source 
This is in addition to 6fce16b1fc10.
This commit is contained in:
Valentin Bartenev 2015-11-17 19:01:41 +03:00
parent 9ef4b63328
commit a9e62b625b
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,6 +177,7 @@ ssize_t
ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
{ {
ssize_t n, written; ssize_t n, written;
ngx_err_t err;
ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
"write: %d, %p, %uz, %O", file->fd, buf, size, offset); "write: %d, %p, %uz, %O", file->fd, buf, size, offset);
@ -189,7 +190,15 @@ ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
n = pwrite(file->fd, buf + written, size, offset); n = pwrite(file->fd, buf + written, size, offset);
if (n == -1) { if (n == -1) {
ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, err = ngx_errno;
if (err == NGX_EINTR) {
ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
"pwrite() was interrupted");
continue;
}
ngx_log_error(NGX_LOG_CRIT, file->log, err,
"pwrite() \"%s\" failed", file->name.data); "pwrite() \"%s\" failed", file->name.data);
return NGX_ERROR; return NGX_ERROR;
} }
@ -221,7 +230,15 @@ ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
n = write(file->fd, buf + written, size); n = write(file->fd, buf + written, size);
if (n == -1) { if (n == -1) {
ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, err = ngx_errno;
if (err == NGX_EINTR) {
ngx_log_debug0(NGX_LOG_DEBUG_CORE, file->log, err,
"write() was interrupted");
continue;
}
ngx_log_error(NGX_LOG_CRIT, file->log, err,
"write() \"%s\" failed", file->name.data); "write() \"%s\" failed", file->name.data);
return NGX_ERROR; return NGX_ERROR;
} }