Mercurial > hg > nginx

comparison src/os/unix/ngx_linux_aio_read.c @ 4129:6903dac6ad19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing Linux AIO syscalls return value handling: syscall(2) uses usual libc convention, it returns -1 on error and sets errno. Obsolete _syscall(2) returns negative value of error. Thanks to Hagai Avrahami.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 16 Sep 2011 12:43:16 +0000
parents 37da005a5808
children d620f497c50f
comparison
equal deleted inserted replaced
4128:4b0b0e77dc3d 4129:6903dac6ad19
14 14
15 15
16 static void ngx_file_aio_event_handler(ngx_event_t *ev); 16 static void ngx_file_aio_event_handler(ngx_event_t *ev);
17 17
18 18
19 static long 19 static int
20 io_submit(aio_context_t ctx, long n, struct iocb **paiocb) 20 io_submit(aio_context_t ctx, long n, struct iocb **paiocb)
21 { 21 {
22 return syscall(SYS_io_submit, ctx, n, paiocb); 22 return syscall(SYS_io_submit, ctx, n, paiocb);
23 } 23 }
24 24
25 25
26 ssize_t 26 ssize_t
27 ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset, 27 ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
28 ngx_pool_t *pool) 28 ngx_pool_t *pool)
29 { 29 {
30 long n; 30 ngx_err_t err;
31 struct iocb *piocb[1]; 31 struct iocb *piocb[1];
32 ngx_event_t *ev; 32 ngx_event_t *ev;
33 ngx_event_aio_t *aio; 33 ngx_event_aio_t *aio;
34 34
35 if (!ngx_file_aio) { 35 if (!ngx_file_aio) {
94 94
95 ev->handler = ngx_file_aio_event_handler; 95 ev->handler = ngx_file_aio_event_handler;
96 96
97 piocb[0] = &aio->aiocb; 97 piocb[0] = &aio->aiocb;
98 98
99 n = io_submit(ngx_aio_ctx, 1, piocb); 99 if (io_submit(ngx_aio_ctx, 1, piocb) == 1) {
100
101 if (n == 1) {
102 ev->active = 1; 100 ev->active = 1;
103 ev->ready = 0; 101 ev->ready = 0;
104 ev->complete = 0; 102 ev->complete = 0;
105 103
106 return NGX_AGAIN; 104 return NGX_AGAIN;
107 } 105 }
108 106
109 n = -n; 107 err = ngx_errno;
110 108
111 if (n == NGX_EAGAIN) { 109 if (err == NGX_EAGAIN) {
112 return ngx_read_file(file, buf, size, offset); 110 return ngx_read_file(file, buf, size, offset);
113 } 111 }
114 112
115 ngx_log_error(NGX_LOG_CRIT, file->log, n, 113 ngx_log_error(NGX_LOG_CRIT, file->log, err,
116 "io_submit(\"%V\") failed", &file->name); 114 "io_submit(\"%V\") failed", &file->name);
117 115
118 if (n == NGX_ENOSYS) { 116 if (err == NGX_ENOSYS) {
119 ngx_file_aio = 0; 117 ngx_file_aio = 0;
120 return ngx_read_file(file, buf, size, offset); 118 return ngx_read_file(file, buf, size, offset);
121 } 119 }
122 120
123 return NGX_ERROR; 121 return NGX_ERROR;