Mercurial > hg > nginx
diff src/os/unix/ngx_aio_read.c @ 164:84036764e215
nginx-0.0.1-2003-10-29-11:30:44 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 29 Oct 2003 08:30:44 +0000 |
parents | 6dfda4cf5200 |
children | 389d7ee9fa60 |
line wrap: on
line diff
--- a/src/os/unix/ngx_aio_read.c Tue Oct 28 15:45:41 2003 +0000 +++ b/src/os/unix/ngx_aio_read.c Wed Oct 29 08:30:44 2003 +0000 @@ -10,102 +10,89 @@ /* - The data is ready - 3 syscalls: - aio_read(), aio_error(), aio_return() - The data is not ready - 4 (kqueue) or 5 syscalls: - aio_read(), aio_error(), notifiction, - aio_error(), aio_return() - aio_cancel(), aio_error() -*/ - + * the ready data requires 3 syscalls: + * aio_write(), aio_error(), aio_return() + * the non-ready data requires 4 (kqueue) or 5 syscalls: + * aio_write(), aio_error(), notifiction, aio_error(), aio_return() + * timeout, aio_cancel(), aio_error() + */ ssize_t ngx_aio_read(ngx_connection_t *c, char *buf, size_t size) { - int rc, first, canceled; - ngx_event_t *ev; + int n; + ngx_event_t *rev; + + rev = c->read; - ev = c->read; + if (rev->active) { + ngx_log_error(NGX_LOG_ALERT, rev->log, 0, "SECOND AIO POST"); + return NGX_AGAIN; + } - canceled = 0; + if (!rev->aio_complete) { + ngx_memzero(&rev->aiocb, sizeof(struct aiocb)); - if (ev->timedout) { - ngx_set_socket_errno(NGX_ETIMEDOUT); - ngx_log_error(NGX_LOG_ERR, ev->log, 0, "aio_read() timed out"); + rev->aiocb.aio_fildes = c->fd; + rev->aiocb.aio_buf = buf; + rev->aiocb.aio_nbytes = size; - rc = aio_cancel(c->fd, &ev->aiocb); - if (rc == -1) { - ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, - "aio_cancel() failed"); +#if (HAVE_KQUEUE) + rev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue; + rev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT; + rev->aiocb.aio_sigevent.sigev_value.sigval_ptr = rev; +#endif + + if (aio_read(&rev->aiocb) == -1) { + ngx_log_error(NGX_LOG_CRIT, rev->log, ngx_errno, + "aio_read() failed"); + rev->error = 1; return NGX_ERROR; } - ngx_log_debug(ev->log, "aio_cancel: %d" _ rc); + ngx_log_debug(rev->log, "aio_read: OK"); - canceled = 1; - - ev->ready = 1; + rev->active = 1; } - first = 0; - - if (!ev->ready) { - ngx_memzero(&ev->aiocb, sizeof(struct aiocb)); - - ev->aiocb.aio_fildes = c->fd; - ev->aiocb.aio_buf = buf; - ev->aiocb.aio_nbytes = size; - -#if (HAVE_KQUEUE) - ev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue; - ev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT; - ev->aiocb.aio_sigevent.sigev_value.sigval_ptr = ev; -#endif + rev->aio_complete = 0; - if (aio_read(&ev->aiocb) == -1) { - ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, - "aio_read() failed"); - return NGX_ERROR; - } - - ngx_log_debug(ev->log, "aio_read: OK"); - - ev->active = 1; - first = 1; - } - - ev->ready = 0; - - rc = aio_error(&ev->aiocb); - if (rc == -1) { - ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, "aio_error() failed"); + n = aio_error(&rev->aiocb); + if (n == -1) { + ngx_log_error(NGX_LOG_ALERT, rev->log, ngx_errno, "aio_error() failed"); + rev->error = 1; return NGX_ERROR; } - if (rc != 0) { - if (rc == NGX_EINPROGRESS) { - if (!first) { - ngx_log_error(NGX_LOG_CRIT, ev->log, rc, + if (n != 0) { + if (n == NGX_EINPROGRESS) { + if (!rev->active) { + ngx_log_error(NGX_LOG_ALERT, rev->log, n, "aio_read() still in progress"); } return NGX_AGAIN; } - if (rc == NGX_ECANCELED && canceled) { - return NGX_ERROR; - } - - ngx_log_error(NGX_LOG_CRIT, ev->log, rc, "aio_read() failed"); + ngx_log_error(NGX_LOG_CRIT, rev->log, n, "aio_read() failed"); + rev->error = 1; return NGX_ERROR; } - rc = aio_return(&ev->aiocb); - if (rc == -1) { - ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, "aio_return() failed"); + n = aio_return(&rev->aiocb); + if (n == -1) { + ngx_log_error(NGX_LOG_ALERT, rev->log, ngx_errno, + "aio_return() failed"); + rev->error = 1; return NGX_ERROR; } - ngx_log_debug(ev->log, "aio_read: %d" _ rc); + rev->active = 0; + + ngx_log_debug(rev->log, "aio_read: %d" _ n); - return rc; + if (n == 0) { + rev->eof = 1; + } + + return n; }