ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_linuxaio.c
(Generate patch)

Comparing libev/ev_linuxaio.c (file contents):
Revision 1.10 by root, Sun Jun 23 02:02:24 2019 UTC vs.
Revision 1.22 by root, Mon Jun 24 21:27:57 2019 UTC

… …
53 * therefore the calculation below will use "exactly" 4kB for the ring buffer 53 * therefore the calculation below will use "exactly" 4kB for the ring buffer
54 */ 54 */
55#define EV_LINUXAIO_DEPTH (128 / 2 - 2 - 1) /* max. number of io events per batch */ 55#define EV_LINUXAIO_DEPTH (128 / 2 - 2 - 1) /* max. number of io events per batch */
56 56
57/*****************************************************************************/ 57/*****************************************************************************/
58/* syscall wrapdadoop */ 58/* syscall wrapdadoop - this section has the raw syscall definitions */
59 59
60#include <sys/syscall.h> /* no glibc wrappers */ 60#include <sys/syscall.h> /* no glibc wrappers */
61 61
62/* aio_abi.h is not versioned in any way, so we cannot test for its existance */ 62/* aio_abi.h is not versioned in any way, so we cannot test for its existance */
63#define IOCB_CMD_POLL 5 63#define IOCB_CMD_POLL 5
… …
80 struct io_event io_events[0]; 80 struct io_event io_events[0];
81}; 81};
82 82
83inline_size 83inline_size
84int 84int
85ev_io_setup (unsigned nr_events, aio_context_t *ctx_idp) 85evsys_io_setup (unsigned nr_events, aio_context_t *ctx_idp)
86{ 86{
87 return syscall (SYS_io_setup, nr_events, ctx_idp); 87 return syscall (SYS_io_setup, nr_events, ctx_idp);
88} 88}
89 89
90inline_size 90inline_size
91int 91int
92ev_io_destroy (aio_context_t ctx_id) 92evsys_io_destroy (aio_context_t ctx_id)
93{ 93{
94 return syscall (SYS_io_destroy, ctx_id); 94 return syscall (SYS_io_destroy, ctx_id);
95} 95}
96 96
97inline_size 97inline_size
98int 98int
99ev_io_submit (aio_context_t ctx_id, long nr, struct iocb *cbp[]) 99evsys_io_submit (aio_context_t ctx_id, long nr, struct iocb *cbp[])
100{ 100{
101 return syscall (SYS_io_submit, ctx_id, nr, cbp); 101 return syscall (SYS_io_submit, ctx_id, nr, cbp);
102} 102}
103 103
104inline_size 104inline_size
105int 105int
106ev_io_cancel (aio_context_t ctx_id, struct iocb *cbp, struct io_event *result) 106evsys_io_cancel (aio_context_t ctx_id, struct iocb *cbp, struct io_event *result)
107{ 107{
108 return syscall (SYS_io_cancel, ctx_id, cbp, result); 108 return syscall (SYS_io_cancel, ctx_id, cbp, result);
109} 109}
110 110
111inline_size 111inline_size
112int 112int
113ev_io_getevents (aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout) 113evsys_io_getevents (aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout)
114{ 114{
115 return syscall (SYS_io_getevents, ctx_id, min_nr, nr, events, timeout); 115 return syscall (SYS_io_getevents, ctx_id, min_nr, nr, events, timeout);
116} 116}
117 117
118/*****************************************************************************/ 118/*****************************************************************************/
… …
125 /*int inuse;*/ 125 /*int inuse;*/
126} *ANIOCBP; 126} *ANIOCBP;
127 127
128inline_size 128inline_size
129void 129void
130linuxaio_array_needsize_iocbp (ANIOCBP *base, int count) 130linuxaio_array_needsize_iocbp (ANIOCBP *base, int offset, int count)
131{ 131{
132 /* TODO: quite the overhead to allocate every iocb separately, maybe use our own alocator? */ 132 /* TODO: quite the overhead to allocate every iocb separately, maybe use our own alocator? */
133 while (count--) 133 while (count--)
134 { 134 {
135 *base = (ANIOCBP)ev_malloc (sizeof (**base)); 135 ANIOCBP iocb = (ANIOCBP)ev_malloc (sizeof (*iocb));
136 /* TODO: full zero initialize required? */ 136
137 /* full zero initialise is probably not required at the moment, but
138 * this is not well documented, so we better do it.
139 */
137 memset (*base, 0, sizeof (**base)); 140 memset (iocb, 0, sizeof (*iocb));
138 /* would be nice to initialize fd/data as well, but array_needsize API doesn't support that */ 141
139 (*base)->io.aio_lio_opcode = IOCB_CMD_POLL; 142 iocb->io.aio_lio_opcode = IOCB_CMD_POLL;
140 ++base; 143 iocb->io.aio_data = offset;
144 iocb->io.aio_fildes = offset;
145
146 base [offset++] = iocb;
141 } 147 }
142} 148}
143 149
144ecb_cold 150ecb_cold
145static void 151static void
… …
153 159
154static void 160static void
155linuxaio_modify (EV_P_ int fd, int oev, int nev) 161linuxaio_modify (EV_P_ int fd, int oev, int nev)
156{ 162{
157 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp); 163 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp);
158 struct aniocb *iocb = linuxaio_iocbps [fd]; 164 ANIOCBP iocb = linuxaio_iocbps [fd];
159 165
160#if EPOLL_FALLBACK 166#if EPOLL_FALLBACK
161 if (iocb->io.aio_reqprio < 0) 167 if (iocb->io.aio_reqprio < 0)
162 { 168 {
163 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0); 169 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0);
164 iocb->io.aio_reqprio = 0; 170 iocb->io.aio_reqprio = 0;
165 } 171 }
166#endif 172#endif
167 173
168 if (iocb->io.aio_buf) 174 if (iocb->io.aio_buf)
169 ev_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); /* always returns an error relevant kernels */ 175 evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); /* always returns an error relevant kernels */
170 176
171 if (nev) 177 if (nev)
172 { 178 {
173 iocb->io.aio_data = fd;
174 iocb->io.aio_fildes = fd;
175 iocb->io.aio_buf = 179 iocb->io.aio_buf =
176 (nev & EV_READ ? POLLIN : 0) 180 (nev & EV_READ ? POLLIN : 0)
177 | (nev & EV_WRITE ? POLLOUT : 0); 181 | (nev & EV_WRITE ? POLLOUT : 0);
178 182
179 /* queue iocb up for io_submit */ 183 /* queue iocb up for io_submit */
180 /* this assumes we only ever get one call per fd per loop iteration */ 184 /* this assumes we only ever get one call per fd per loop iteration */
… …
182 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit); 186 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit);
183 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io; 187 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io;
184 } 188 }
185} 189}
186 190
191#if EPOLL_FALLBACK
192
193static void
194linuxaio_rearm_epoll (EV_P_ struct iocb *iocb, int op)
195{
196 struct epoll_event eev;
197
198 eev.events = EPOLLONESHOT;
199 if (iocb->aio_buf & POLLIN ) eev.events |= EPOLLIN ;
200 if (iocb->aio_buf & POLLOUT) eev.events |= EPOLLOUT;
201 eev.data.fd = iocb->aio_fildes;
202
203 if (epoll_ctl (backend_fd, op, iocb->aio_fildes, &eev) < 0)
204 ev_syserr ("(libeio) linuxaio epoll_ctl");
205}
206
207static void
208linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents)
209{
210 struct epoll_event events[16];
211
212 for (;;)
213 {
214 int idx;
215 int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
216
217 if (expect_false (res < 0))
218 ev_syserr ("(libev) linuxaio epoll_wait");
219 else if (!res)
220 break;
221
222 for (idx = res; idx--; )
223 {
224 int fd = events [idx].data.fd;
225 uint32_t ev = events [idx].events;
226
227 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
228
229 linuxaio_rearm_epoll (EV_A_ &linuxaio_iocbps [fd]->io, EPOLL_CTL_MOD);
230
231 fd_event (EV_A_ fd,
232 (ev & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
233 | (ev & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0));
234 }
235
236 if (res < sizeof (events) / sizeof (events [0]))
237 break;
238 }
239}
240
241#endif
242
187static void 243static void
188linuxaio_parse_events (EV_P_ struct io_event *ev, int nr) 244linuxaio_parse_events (EV_P_ struct io_event *ev, int nr)
189{ 245{
190 while (nr) 246 while (nr)
191 { 247 {
192 int fd = ev->data; 248 int fd = ev->data;
193 int res = ev->res; 249 int res = ev->res;
194 250
195 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax)); 251 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
196 252
197 /* linux aio is oneshot: rearm fd */ 253 /* linux aio is oneshot: rearm fd. TODO: this does more work than needed */
198 linuxaio_iocbps [fd]->io.aio_buf = 0; 254 linuxaio_iocbps [fd]->io.aio_buf = 0;
199 anfds [fd].events = 0; 255 anfds [fd].events = 0;
200 fd_change (EV_A_ fd, 0); 256 fd_change (EV_A_ fd, 0);
201 257
202 /* feed events, we do not expect or handle POLLNVAL */ 258 /* feed events, we do not expect or handle POLLNVAL */
203 if (ecb_expect_false (res & POLLNVAL))
204 fd_kill (EV_A_ fd);
205 else
206 fd_event ( 259 fd_event (
207 EV_A_ 260 EV_A_
208 fd, 261 fd,
209 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) 262 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
210 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) 263 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
211 ); 264 );
212 265
213 --nr; 266 --nr;
214 ++ev; 267 ++ev;
215 } 268 }
216} 269}
… …
219static int 272static int
220linuxaio_get_events_from_ring (EV_P) 273linuxaio_get_events_from_ring (EV_P)
221{ 274{
222 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx; 275 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx;
223 276
224 unsigned head = ring->head; 277 /* the kernel reads and writes both of these variables, */
278 /* as a C extension, we assume that volatile use here */
279 /* both makes reads atomic and once-only */
280 unsigned head = *(volatile unsigned *)&ring->head;
225 unsigned tail = *(volatile unsigned *)&ring->tail; 281 unsigned tail = *(volatile unsigned *)&ring->tail;
226 282
227 if (head == tail) 283 if (head == tail)
228 return 0; 284 return 0;
229 285
230 /* bail out if the ring buffer doesn't match the expected layout */ 286 /* bail out if the ring buffer doesn't match the expected layout */
231 if (ecb_expect_false (ring->magic != AIO_RING_MAGIC) 287 if (expect_false (ring->magic != AIO_RING_MAGIC)
232 || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES 288 || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
233 || ring->header_length != sizeof (struct aio_ring)) /* TODO: or use it to find io_event[0]? */ 289 || ring->header_length != sizeof (struct aio_ring)) /* TODO: or use it to find io_event[0]? */
234 return 0; 290 return 0;
235 291
292 /* make sure the events up to tail are visible */
236 ECB_MEMORY_FENCE_ACQUIRE; 293 ECB_MEMORY_FENCE_ACQUIRE;
237 294
238 /* parse all available events, but only once, to avoid starvation */ 295 /* parse all available events, but only once, to avoid starvation */
239 if (tail > head) /* normal case around */ 296 if (tail > head) /* normal case around */
240 linuxaio_parse_events (EV_A_ ring->io_events + head, tail - head); 297 linuxaio_parse_events (EV_A_ ring->io_events + head, tail - head);
… …
242 { 299 {
243 linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head); 300 linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head);
244 linuxaio_parse_events (EV_A_ ring->io_events, tail); 301 linuxaio_parse_events (EV_A_ ring->io_events, tail);
245 } 302 }
246 303
247 ring->head = tail; 304 /* TODO: we only need a compiler barrier here, not a read fence */
305 ECB_MEMORY_FENCE_RELEASE;
306 /* as an extension to C, we hope that the volatile will make this atomic and once-only */
307 *(volatile unsigned *)&ring->head = tail;
308 /* make sure kernel can see our new head value - probably not required */
309 ECB_MEMORY_FENCE_RELEASE;
248 310
249 return 1; 311 return 1;
250} 312}
251 313
252/* read at least one event from kernel, or timeout */ 314/* read at least one event from kernel, or timeout */
253inline_size 315inline_size
254void 316void
255linuxaio_get_events (EV_P_ ev_tstamp timeout) 317linuxaio_get_events (EV_P_ ev_tstamp timeout)
256{ 318{
257 struct timespec ts; 319 struct timespec ts;
258 struct io_event ioev; 320 struct io_event ioev[1];
259 int res; 321 int res;
260 322
261 if (linuxaio_get_events_from_ring (EV_A)) 323 if (linuxaio_get_events_from_ring (EV_A))
262 return; 324 return;
263 325
264 /* no events, so wait for at least one, then poll ring buffer again */ 326 /* no events, so wait for at least one, then poll ring buffer again */
265 /* this degrades to one event per loop iteration */ 327 /* this degrades to one event per loop iteration */
266 /* if the ring buffer changes layout, but so be it */ 328 /* if the ring buffer changes layout, but so be it */
267 329
330 EV_RELEASE_CB;
331
268 ts.tv_sec = (long)timeout; 332 ts.tv_sec = (long)timeout;
269 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9); 333 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9);
270 334
271 res = ev_io_getevents (linuxaio_ctx, 1, 1, &ioev, &ts); 335 res = evsys_io_getevents (linuxaio_ctx, 1, sizeof (ioev) / sizeof (ioev [0]), ioev, &ts);
336
337 EV_ACQUIRE_CB;
272 338
273 if (res < 0) 339 if (res < 0)
274 if (errno == EINTR) 340 if (errno == EINTR)
275 /* ignored */; 341 /* ignored */;
276 else 342 else
277 ev_syserr ("(libev) linuxaio io_getevents"); 343 ev_syserr ("(libev) linuxaio io_getevents");
278 else if (res) 344 else if (res)
279 { 345 {
280 /* at least one event received, handle it and any remaining ones in the ring buffer */ 346 /* at least one event received, handle it and any remaining ones in the ring buffer */
281 linuxaio_parse_events (EV_A_ &ioev, 1); 347 linuxaio_parse_events (EV_A_ ioev, res);
282 linuxaio_get_events_from_ring (EV_A); 348 linuxaio_get_events_from_ring (EV_A);
283 } 349 }
284} 350}
285
286#if EPOLL_FALLBACK
287static void
288linuxaio_rearm_epoll (EV_P_ struct iocb *iocb, int op)
289{
290 struct epoll_event eev;
291
292 eev.events = EPOLLONESHOT;
293 if (iocb->aio_buf & POLLIN ) eev.events |= EPOLLIN ;
294 if (iocb->aio_buf & POLLOUT) eev.events |= EPOLLOUT;
295 eev.data.fd = iocb->aio_fildes;
296
297 if (epoll_ctl (backend_fd, op, iocb->aio_fildes, &eev) < 0)
298 ev_syserr ("(libeio) linuxaio epoll_ctl");
299}
300#endif
301 351
302static void 352static void
303linuxaio_poll (EV_P_ ev_tstamp timeout) 353linuxaio_poll (EV_P_ ev_tstamp timeout)
304{ 354{
305 int submitted; 355 int submitted;
… …
309 /* io_submit might return less than the requested number of iocbs */ 359 /* io_submit might return less than the requested number of iocbs */
310 /* this is, afaics, only because of errors, but we go by the book and use a loop, */ 360 /* this is, afaics, only because of errors, but we go by the book and use a loop, */
311 /* which allows us to pinpoint the errornous iocb */ 361 /* which allows us to pinpoint the errornous iocb */
312 for (submitted = 0; submitted < linuxaio_submitcnt; ) 362 for (submitted = 0; submitted < linuxaio_submitcnt; )
313 { 363 {
364#if 0
365 int res;
366 if (linuxaio_submits[submitted]->aio_fildes == backend_fd)
367 res = evsys_io_submit (linuxaio_ctx, 1, linuxaio_submits + submitted);
368 else
369 { res = -1; errno = EINVAL; };
370#else
314 int res = ev_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted); 371 int res = evsys_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted);
372#endif
315 373
316 if (ecb_expect_false (res < 0)) 374 if (expect_false (res < 0))
317 if (errno == EAGAIN) 375 if (errno == EAGAIN)
318 { 376 {
319 /* This happens when the ring buffer is full, at least. I assume this means 377 /* This happens when the ring buffer is full, at least. I assume this means
320 * that the event was queued synchronously during io_submit, and thus 378 * that the event was queued synchronously during io_submit, and thus
321 * the buffer overflowed. 379 * the buffer overflowed.
322 * In this case, we just try in next loop iteration. 380 * In this case, we just try in next loop iteration.
323 * This should not result in a few fds taking priority, as the interface 381 * This should not result in a few fds taking priority, as the interface
324 * is one-shot, and we submit iocb's in a round-robin fashion. 382 * is one-shot, and we submit iocb's in a round-robin fashion.
383 * TODO: maybe make "submitted" persistent, so we don't have to memmove?
325 */ 384 */
385 if (ecb_expect_false (submitted))
386 {
326 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits)); 387 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits));
327 linuxaio_submitcnt -= submitted; 388 linuxaio_submitcnt -= submitted;
389 }
390
328 timeout = 0; 391 timeout = 0;
329 break; 392 break;
330 } 393 }
331#if EPOLL_FALLBACK 394#if EPOLL_FALLBACK
332 else if (errno == EINVAL) 395 else if (errno == EINVAL)
333 { 396 {
334 /* This hapΓΌpens for unsupported fds, officially, but in my testing, 397 /* This happens for unsupported fds, officially, but in my testing,
335 * also randomly happens for supported fds. We fall back to good old 398 * also randomly happens for supported fds. We fall back to good old
336 * poll() here, under the assumption that this is a very rare case. 399 * poll() here, under the assumption that this is a very rare case.
400 * See https://lore.kernel.org/patchwork/patch/1047453/ to see
401 * discussion about such a case (ttys) where polling for POLLIN
402 * fails but POLLIN|POLLOUT works.
337 */ 403 */
338 struct iocb *iocb = linuxaio_submits [submitted]; 404 struct iocb *iocb = linuxaio_submits [submitted];
405
406 linuxaio_rearm_epoll (EV_A_ linuxaio_submits [submitted], EPOLL_CTL_ADD);
407 iocb->aio_reqprio = -1; /* mark iocb as epoll */
408
339 res = 1; /* skip this iocb */ 409 res = 1; /* skip this iocb */
340
341 linuxaio_rearm_epoll (EV_A_ iocb, EPOLL_CTL_ADD);
342 iocb->aio_reqprio = -1; /* mark iocb as epoll */
343 } 410 }
344#endif 411#endif
412 else if (errno == EBADF)
413 {
414 fd_kill (EV_A_ linuxaio_submits [submitted]->aio_fildes);
415
416 res = 1; /* skip this iocb */
417 }
345 else 418 else
346 ev_syserr ("(libev) linuxaio io_submit"); 419 ev_syserr ("(libev) linuxaio io_submit");
347 420
348 submitted += res; 421 submitted += res;
349 } 422 }
… …
353 /* second phase: fetch and parse events */ 426 /* second phase: fetch and parse events */
354 427
355 linuxaio_get_events (EV_A_ timeout); 428 linuxaio_get_events (EV_A_ timeout);
356} 429}
357 430
358#if EPOLL_FALLBACK
359
360static void
361linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents)
362{
363 struct epoll_event events[16];
364
365 for (;;)
366 {
367 int idx;
368 int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
369
370 if (ecb_expect_false (res < 0))
371 ev_syserr ("(libev) linuxaio epoll_wait");
372 else if (!res)
373 break;
374
375 for (idx = res; idx--; )
376 {
377 int fd = events [idx].data.fd;
378 uint32_t ev = events [idx].events;
379
380 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
381
382 linuxaio_rearm_epoll (EV_A_ &linuxaio_iocbps [fd]->io, EPOLL_CTL_MOD);
383
384 fd_event (EV_A_ fd,
385 (ev & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
386 | (ev & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0));
387 }
388
389 if (res < sizeof (events) / sizeof (events [0]))
390 break;
391 }
392}
393
394#endif
395
396inline_size 431inline_size
397int 432int
398linuxaio_init (EV_P_ int flags) 433linuxaio_init (EV_P_ int flags)
399{ 434{
400 /* would be great to have a nice test for IOCB_CMD_POLL instead */ 435 /* would be great to have a nice test for IOCB_CMD_POLL instead */
401 /* also: test some semi-common fd types, such as files and ttys in recommended_backends */ 436 /* also: test some semi-common fd types, such as files and ttys in recommended_backends */
402 if (ev_linux_version () < 0x041200) /* 4.18 introduced IOCB_CMD_POLL */ 437#if EPOLL_FALLBACK
438 /* 4.19 made epoll work */
439 if (ev_linux_version () < 0x041300)
403 return 0; 440 return 0;
441#else
442 /* 4.18 introduced IOCB_CMD_POLL */
443 if (ev_linux_version () < 0x041200)
444 return 0;
445#endif
404 446
405 linuxaio_ctx = 0; 447 linuxaio_ctx = 0;
406 if (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 448 if (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
407 return 0; 449 return 0;
408 450
409#if EPOLL_FALLBACK 451#if EPOLL_FALLBACK
410 backend_fd = ev_epoll_create (); 452 backend_fd = ev_epoll_create ();
411 if (backend_fd < 0) 453 if (backend_fd < 0)
412 { 454 {
413 ev_io_destroy (linuxaio_ctx); 455 evsys_io_destroy (linuxaio_ctx);
414 return 0; 456 return 0;
415 } 457 }
416 458
417 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ); 459 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
460 ev_set_priority (&linuxaio_epoll_w, EV_MAXPRI);
418 ev_io_start (EV_A_ &linuxaio_epoll_w); 461 ev_io_start (EV_A_ &linuxaio_epoll_w);
462 ev_unref (EV_A); /* watcher should not keep loop alive */
419#endif 463#endif
420 464
421 backend_modify = linuxaio_modify; 465 backend_modify = linuxaio_modify;
422 backend_poll = linuxaio_poll; 466 backend_poll = linuxaio_poll;
423 467
… …
437{ 481{
438#if EPOLL_FALLBACK 482#if EPOLL_FALLBACK
439 close (backend_fd); 483 close (backend_fd);
440#endif 484#endif
441 linuxaio_free_iocbp (EV_A); 485 linuxaio_free_iocbp (EV_A);
442 ev_io_destroy (linuxaio_ctx); 486 evsys_io_destroy (linuxaio_ctx);
443} 487}
444 488
445inline_size 489inline_size
446void 490void
447linuxaio_fork (EV_P) 491linuxaio_fork (EV_P)
… …
449 /* this frees all iocbs, which is very heavy-handed */ 493 /* this frees all iocbs, which is very heavy-handed */
450 linuxaio_destroy (EV_A); 494 linuxaio_destroy (EV_A);
451 linuxaio_submitcnt = 0; /* all pointers were invalidated */ 495 linuxaio_submitcnt = 0; /* all pointers were invalidated */
452 496
453 linuxaio_ctx = 0; 497 linuxaio_ctx = 0;
454 while (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 498 while (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
455 ev_syserr ("(libev) linuxaio io_setup"); 499 ev_syserr ("(libev) linuxaio io_setup");
456 500
457#if EPOLL_FALLBACK 501#if EPOLL_FALLBACK
458 while ((backend_fd = ev_epoll_create ()) < 0) 502 while ((backend_fd = ev_epoll_create ()) < 0)
459 ev_syserr ("(libev) linuxaio epoll_create"); 503 ev_syserr ("(libev) linuxaio epoll_create");
460 504
461 ev_io_stop (EV_A_ &linuxaio_epoll_w); 505 ev_io_stop (EV_A_ &linuxaio_epoll_w);
462 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ); 506 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
463 ev_io_start (EV_A_ &linuxaio_epoll_w); 507 ev_io_start (EV_A_ &linuxaio_epoll_w);
464 ev_unref (EV_A); /* watcher should not keep loop alive */
465#endif 508#endif
466 509
467 fd_rearm_all (EV_A); 510 fd_rearm_all (EV_A);
468} 511}
469 512

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines