IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 14:13:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved writev() handling code to a separate function.

Browse Source 
This reduces code duplication and unifies debug logging of the writev() syscall
among various send chain functions.
This commit is contained in:
Valentin Bartenev 2014-08-13 15:11:45 +04:00
parent 79ddab189f
commit a301e1a706
5 changed files with 60 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/os/unix/ngx_darwin_sendfile_chain.c
View File

@ -33,6 +33,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
int rc; int rc;
off_t send, prev_send, sent; off_t send, prev_send, sent;
off_t file_size; off_t file_size;
ssize_t n;
ngx_uint_t eintr; ngx_uint_t eintr;
ngx_err_t err; ngx_err_t err;
ngx_buf_t *file; ngx_buf_t *file;
@ -172,33 +173,13 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
rc, file->file_pos, sent, file_size + header.size); rc, file->file_pos, sent, file_size + header.size);
} else { } else {
rc = writev(c->fd, header.iovs, header.count); n = ngx_writev(c, &header);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, if (n == NGX_ERROR) {
"writev: %d of %uz", rc, header.size); return NGX_CHAIN_ERROR;
if (rc == -1) {
err = ngx_errno;
switch (err) {
case NGX_EAGAIN:
break;
case NGX_EINTR:
eintr = 1;
break;
default:
wev->error = 1;
ngx_connection_error(c, err, "writev() failed");
return NGX_CHAIN_ERROR;
}
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
"writev() not ready");
} }
sent = rc > 0 ? rc : 0; sent = (n == NGX_AGAIN) ? 0 : n;
} }
c->sent += sent; c->sent += sent;

29
src/os/unix/ngx_freebsd_sendfile_chain.c
View File

@ -35,6 +35,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
int rc, flags; int rc, flags;
off_t send, prev_send, sent; off_t send, prev_send, sent;
size_t file_size; size_t file_size;
ssize_t n;
ngx_uint_t eintr, eagain; ngx_uint_t eintr, eagain;
ngx_err_t err; ngx_err_t err;
ngx_buf_t *file; ngx_buf_t *file;
@ -217,33 +218,13 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
rc, file->file_pos, sent, file_size + header.size); rc, file->file_pos, sent, file_size + header.size);
} else { } else {
rc = writev(c->fd, header.iovs, header.count); n = ngx_writev(c, &header);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, if (n == NGX_ERROR) {
"writev: %d of %uz", rc, header.size); return NGX_CHAIN_ERROR;
if (rc == -1) {
err = ngx_errno;
switch (err) {
case NGX_EAGAIN:
break;
case NGX_EINTR:
eintr = 1;
break;
default:
wev->error = 1;
ngx_connection_error(c, err, "writev() failed");
return NGX_CHAIN_ERROR;
}
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
"writev() not ready");
} }
sent = rc > 0 ? rc : 0; sent = (n == NGX_AGAIN) ? 0 : n;
} }
c->sent += sent; c->sent += sent;

28
src/os/unix/ngx_linux_sendfile_chain.c
View File

@ -33,6 +33,7 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
int rc, tcp_nodelay; int rc, tcp_nodelay;
off_t send, prev_send, sent; off_t send, prev_send, sent;
size_t file_size; size_t file_size;
ssize_t n;
ngx_err_t err; ngx_err_t err;
ngx_buf_t *file; ngx_buf_t *file;
ngx_uint_t eintr; ngx_uint_t eintr;
@ -199,32 +200,13 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
rc, file->file_pos, sent, file_size); rc, file->file_pos, sent, file_size);
} else { } else {
rc = writev(c->fd, header.iovs, header.count); n = ngx_writev(c, &header);
if (rc == -1) { if (n == NGX_ERROR) {
err = ngx_errno; return NGX_CHAIN_ERROR;
switch (err) {
case NGX_EAGAIN:
break;
case NGX_EINTR:
eintr = 1;
break;
default:
wev->error = 1;
ngx_connection_error(c, err, "writev() failed");
return NGX_CHAIN_ERROR;
}
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
"writev() not ready");
} }
sent = rc > 0 ? rc : 0; sent = (n == NGX_AGAIN) ? 0 : n;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "writev: %O", sent);
} }
c->sent += sent; c->sent += sent;

3
src/os/unix/ngx_os.h
View File

@ -75,6 +75,9 @@ ngx_chain_t *ngx_output_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *in,
size_t limit, ngx_log_t *log); size_t limit, ngx_log_t *log);
ssize_t ngx_writev(ngx_connection_t *c, ngx_iovec_t *vec);
extern ngx_os_io_t ngx_os_io; extern ngx_os_io_t ngx_os_io;
extern ngx_int_t ngx_ncpu; extern ngx_int_t ngx_ncpu;
extern ngx_int_t ngx_max_sockets; extern ngx_int_t ngx_max_sockets;

73
src/os/unix/ngx_writev_chain.c
View File

@ -15,8 +15,6 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
{ {
ssize_t n, sent; ssize_t n, sent;
off_t send, prev_send; off_t send, prev_send;
ngx_uint_t eintr;
ngx_err_t err;
ngx_chain_t *cl; ngx_chain_t *cl;
ngx_event_t *wev; ngx_event_t *wev;
ngx_iovec_t vec; ngx_iovec_t vec;
@ -51,7 +49,6 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
vec.nalloc = NGX_IOVS_PREALLOCATE; vec.nalloc = NGX_IOVS_PREALLOCATE;
for ( ;; ) { for ( ;; ) {
eintr = 0;
prev_send = send; prev_send = send;
/* create the iovec and coalesce the neighbouring bufs */ /* create the iovec and coalesce the neighbouring bufs */
@ -83,42 +80,18 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
send += vec.size; send += vec.size;
n = writev(c->fd, vec.iovs, vec.count); n = ngx_writev(c, &vec);
if (n == -1) { if (n == NGX_ERROR) {
err = ngx_errno; return NGX_CHAIN_ERROR;
switch (err) {
case NGX_EAGAIN:
break;
case NGX_EINTR:
eintr = 1;
break;
default:
wev->error = 1;
(void) ngx_connection_error(c, err, "writev() failed");
return NGX_CHAIN_ERROR;
}
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
"writev() not ready");
} }
sent = n > 0 ? n : 0; sent = (n == NGX_AGAIN) ? 0 : n;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "writev: %z", sent);
c->sent += sent; c->sent += sent;
in = ngx_chain_update_sent(in, sent); in = ngx_chain_update_sent(in, sent);
if (eintr) {
send = prev_send;
continue;
}
if (send - prev_send != sent) { if (send - prev_send != sent) {
wev->ready = 0; wev->ready = 0;
return in; return in;
@ -203,3 +176,41 @@ ngx_output_chain_to_iovec(ngx_iovec_t *vec, ngx_chain_t *in, size_t limit,
return in; return in;
} }
ssize_t
ngx_writev(ngx_connection_t *c, ngx_iovec_t *vec)
{
ssize_t n;
ngx_err_t err;
eintr:
n = writev(c->fd, vec->iovs, vec->count);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"writev: %z of %uz", n, vec->size);
if (n == -1) {
err = ngx_errno;
switch (err) {
case NGX_EAGAIN:
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
"writev() not ready");
return NGX_AGAIN;
case NGX_EINTR:
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
"writev() was interrupted");
goto eintr;
default:
c->write->error = 1;
ngx_connection_error(c, err, "writev() failed");
return NGX_ERROR;
}
}
return n;
}