Mercurial > hg > nginx-vendor-0-8
annotate src/os/unix/ngx_aio_read_chain.c @ 394:05981f639d21 NGINX_0_7_9
nginx 0.7.9
*) Change: now ngx_http_charset_module works by default with following
MIME types: text/html, text/css, text/xml, text/plain,
text/vnd.wap.wml, application/x-javascript, and application/rss+xml.
*) Feature: the "charset_types" and "addition_types" directives.
*) Feature: now the "gzip_types", "ssi_types", and "sub_filter_types"
directives use hash.
*) Feature: the ngx_cpp_test_module.
*) Feature: the "expires" directive supports daily time.
*) Feature: the ngx_http_xslt_module improvements and bug fixing.
Thanks to Denis F. Latypoff and Maxim Dounin.
*) Bugfix: the "log_not_found" directive did not work for index files
tests.
*) Bugfix: HTTPS connections might hang, if kqueue, epoll, rtsig, or
eventport methods were used; the bug had appeared in 0.7.7.
*) Bugfix: if the "server_name", "valid_referers", and "map" directives
used an "*.domain.tld" wildcard and exact name "domain.tld" was not
set, then the exact name was matched by the wildcard; the bugs had
appeared in 0.3.18.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Tue, 12 Aug 2008 00:00:00 +0400 |
| parents | df17fbafec8f |
| children | 86dad910eeb6 |
| rev | line source |
|---|---|
| 0 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_event.h> | |
| 10 #include <ngx_aio.h> | |
| 11 | |
| 12 | |
| 126 | 13 ssize_t |
| 14 ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl) | |
| 0 | 15 { |
| 16 int n; | |
| 17 u_char *buf, *prev; | |
| 18 size_t size; | |
| 19 ssize_t total; | |
| 20 | |
| 21 if (c->read->pending_eof) { | |
| 22 c->read->ready = 0; | |
| 23 return 0; | |
| 24 } | |
| 25 | |
| 26 total = 0; | |
| 27 | |
| 28 while (cl) { | |
| 29 | |
| 30 /* we can post the single aio operation only */ | |
| 31 | |
| 32 if (!c->read->ready) { | |
| 33 return total ? total : NGX_AGAIN; | |
| 34 } | |
| 35 | |
| 36 buf = cl->buf->last; | |
| 37 prev = cl->buf->last; | |
| 38 size = 0; | |
| 39 | |
| 40 /* coalesce the neighbouring bufs */ | |
| 41 | |
| 42 while (cl && prev == cl->buf->last) { | |
| 43 size += cl->buf->end - cl->buf->last; | |
| 44 prev = cl->buf->end; | |
| 45 cl = cl->next; | |
| 46 } | |
| 47 | |
| 48 n = ngx_aio_read(c, buf, size); | |
| 49 | |
| 50 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_read: %d", n); | |
| 51 | |
| 52 if (n == NGX_AGAIN) { | |
| 53 return total ? total : NGX_AGAIN; | |
| 54 } | |
| 55 | |
| 56 if (n == NGX_ERROR) { | |
| 57 return NGX_ERROR; | |
| 58 } | |
| 59 | |
| 60 if (n == 0) { | |
| 61 c->read->pending_eof = 1; | |
| 62 if (total) { | |
| 63 c->read->eof = 0; | |
| 64 c->read->ready = 1; | |
| 65 } | |
| 66 return total; | |
| 67 } | |
| 68 | |
| 69 if (n > 0) { | |
| 70 total += n; | |
| 71 } | |
| 72 | |
| 73 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
| 74 "aio_read total: %d", total); | |
| 75 } | |
| 76 | |
| 77 return total ? total : NGX_AGAIN; | |
| 78 } |