Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge of r4416: 

Fixed AIO error handling on FreeBSD.

The aio_return() must be called regardless of the error returned by
aio_error().  Not calling it resulted in various problems up to segmentation
faults (as AIO events are level-triggered and were reported again and again).

Additionally, in "aio sendfile" case r->blocked was incremented in case of
error returned from ngx_file_aio_read(), thus causing request hangs.
This commit is contained in:
Maxim Dounin 2012-02-05 20:05:11 +00:00
parent 0323c6f524
commit 39a288282c
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/ngx_http_copy_filter_module.c
View File

@ -190,7 +190,7 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
rc = n;
if (file->aio) {
if (rc == NGX_AGAIN) {
file->aio->data = r;
file->aio->handler = ngx_http_copy_aio_sendfile_event_handler;

27
src/os/unix/ngx_file_aio_read.c
View File

@ -157,24 +157,15 @@ ngx_file_aio_result(ngx_file_t *file, ngx_event_aio_t *aio, ngx_event_t *ev)
return NGX_ERROR;
}
if (n != 0) {
if (n == NGX_EINPROGRESS) {
if (ev->ready) {
ev->ready = 0;
ngx_log_error(NGX_LOG_ALERT, file->log, n,
"aio_read(\"%V\") still in progress",
&file->name);
}
return NGX_AGAIN;
if (n == NGX_EINPROGRESS) {
if (ev->ready) {
ev->ready = 0;
ngx_log_error(NGX_LOG_ALERT, file->log, n,
"aio_read(\"%V\") still in progress",
&file->name);
}
aio->err = n;
ev->ready = 0;
ngx_log_error(NGX_LOG_CRIT, file->log, n,
"aio_read(\"%V\") failed", &file->name);
return NGX_ERROR;
return NGX_AGAIN;
}
n = aio_return(&aio->aiocb);
@ -182,9 +173,9 @@ ngx_file_aio_result(ngx_file_t *file, ngx_event_aio_t *aio, ngx_event_t *ev)
if (n == -1) {
err = ngx_errno;
aio->err = err;
ev->ready = 0;
ev->ready = 1;
ngx_log_error(NGX_LOG_ALERT, file->log, err,
ngx_log_error(NGX_LOG_CRIT, file->log, err,
"aio_return(\"%V\") failed", &file->name);
return NGX_ERROR;
}