diff options
Diffstat (limited to 'src/os')
-rw-r--r-- | src/os/unix/ngx_files.c | 26 | ||||
-rw-r--r-- | src/os/unix/ngx_recv_chain.c | 42 |
2 files changed, 67 insertions, 1 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index c9e62b2b7..8aac3e27e 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -12,7 +12,7 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset) n = pread(file->fd, buf, size, offset); if (n == -1) { - ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "read() failed"); + ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "pread() failed"); return NGX_ERROR; } @@ -21,6 +21,30 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset) return n; } + +ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset) +{ + ssize_t n; + + n = pwrite(file->fd, buf, size, offset); + + if (n == -1) { + ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "pwrite() failed"); + return NGX_ERROR; + } + + if (n != size) { + ngx_log_error(NGX_LOG_ERR, file->log, 0, + "pwrite() has written only %d of %d", n, size); + return NGX_ERROR; + } + + file->offset += n; + + return n; +} + + #if 0 ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset) diff --git a/src/os/unix/ngx_recv_chain.c b/src/os/unix/ngx_recv_chain.c new file mode 100644 index 000000000..221f306cd --- /dev/null +++ b/src/os/unix/ngx_recv_chain.c @@ -0,0 +1,42 @@ + +#include <ngx_config.h> +#include <ngx_core.h> +#include <ngx_errno.h> +#include <ngx_log.h> +#include <ngx_connection.h> + + +ssize_t ngx_recv_chain(ngx_connection_t *c, ngx_chain_t *ce) +{ + int n; + struct iovec *iov; + ngx_err_t err; + ngx_array_t io; + + ngx_init_array(io, c->pool, 10, sizeof(struct iovec), NGX_ERROR); + + while (ce) { + ngx_test_null(iov, ngx_push_array(&io), NGX_ERROR); + iov->iov_base = ce->hunk->pos; + iov->iov_len = ce->hunk->last - ce->hunk->pos; + ce = ce->next; + } + + n = readv(c->fd, (struct iovec *) io.elts, io.nelts); + + ngx_destroy_array(&io); + + if (n == -1) { + c->read->ready = 0; + + if (err == NGX_EAGAIN) { + ngx_log_error(NGX_LOG_INFO, c->log, err, "readv() returned EAGAIN"); + return NGX_AGAIN; + } + + ngx_log_error(NGX_LOG_ERR, c->log, err, "readv() failed"); + return NGX_ERROR; + } + + return n; +} |