diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2015-11-17 19:01:41 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2015-11-17 19:01:41 +0300 |
| commit | a9e62b625b48bda279c8d7027b1a4d375e67c2d1 (patch) | |
| tree | 2a98aaa63e7bc02ae752c4629eab20e51a2fd11b | |
| parent | 9ef4b63328f534a647b367be1bce3b5a159e7c32 (diff) | |
Handled EINTR from write() and pwrite() syscalls.
This is in addition to 6fce16b1fc10.
| -rw-r--r-- | src/os/unix/ngx_files.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index 36b6b67c..48202eb9 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -176,7 +176,8 @@ ngx_thread_read_handler(void *data, ngx_log_t *log) ssize_t 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, "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); 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); 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); 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); return NGX_ERROR; } |