IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-18 21:23:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

retry aio sendfile if data are ready

Browse Source
This commit is contained in:
Igor Sysoev 2009-08-31 14:00:16 +00:00
parent 06bb9d294a
commit 9f9054df82
1 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/http/ngx_http_copy_filter_module.c
View File

@ -133,55 +133,64 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
r->request_output = 1; r->request_output = 1;
} }
rc = ngx_output_chain(ctx, in); for ( ;; ) {
rc = ngx_output_chain(ctx, in);
if (ctx->in == NULL) { if (ctx->in == NULL) {
r->buffered &= ~NGX_HTTP_COPY_BUFFERED; r->buffered &= ~NGX_HTTP_COPY_BUFFERED;
} else { } else {
r->buffered |= NGX_HTTP_COPY_BUFFERED; r->buffered |= NGX_HTTP_COPY_BUFFERED;
} }
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http copy filter: %i \"%V?%V\"", rc, &r->uri, &r->args); "http copy filter: %i \"%V?%V\"", rc, &r->uri, &r->args);
#if (NGX_HAVE_FILE_AIO && NGX_HAVE_AIO_SENDFILE) #if (NGX_HAVE_FILE_AIO && NGX_HAVE_AIO_SENDFILE)
if (c->busy_sendfile) { if (c->busy_sendfile) {
off_t offset; ssize_t n;
ngx_file_t *file; off_t offset;
ngx_http_ephemeral_t *e; ngx_file_t *file;
ngx_http_ephemeral_t *e;
file = c->busy_sendfile->file; file = c->busy_sendfile->file;
offset = c->busy_sendfile->file_pos; offset = c->busy_sendfile->file_pos;
if (file->aio) { if (file->aio) {
c->aio_sendfile = (offset != file->aio->last_offset); c->aio_sendfile = (offset != file->aio->last_offset);
file->aio->last_offset = offset; file->aio->last_offset = offset;
if (c->aio_sendfile == 0) { if (c->aio_sendfile == 0) {
ngx_log_error(NGX_LOG_ALERT, c->log, 0, ngx_log_error(NGX_LOG_ALERT, c->log, 0,
"sendfile(%V) returned busy again", &file->name); "sendfile(%V) returned busy again",
&file->name);
}
}
c->busy_sendfile = NULL;
e = (ngx_http_ephemeral_t *) &r->uri_start;
n = ngx_file_aio_read(file, e->preload, 4, offset, r->pool);
if (n > 0) {
continue;
}
rc = n;
if (file->aio) {
file->aio->data = r;
file->aio->handler = ngx_http_copy_aio_sendfile_event_handler;
r->main->blocked++;
r->aio = 1;
} }
} }
c->busy_sendfile = NULL;
e = (ngx_http_ephemeral_t *) &r->uri_start;
(void) ngx_file_aio_read(file, e->preload, 4, offset, r->pool);
if (file->aio) {
file->aio->data = r;
file->aio->handler = ngx_http_copy_aio_sendfile_event_handler;
r->main->blocked++;
r->aio = 1;
}
}
#endif #endif
return rc; return rc;
}
} }