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.30 by root, Tue Jun 25 17:54:02 2019 UTC vs.
Revision 1.34 by root, Wed Jun 26 00:01:46 2019 UTC

… …
124 * our syscalls return < 0, not == -1, on error. which is good 124 * our syscalls return < 0, not == -1, on error. which is good
125 * enough for linux aio. 125 * enough for linux aio.
126 * TODO: arm is also common nowadays, maybe even mips and x86 126 * TODO: arm is also common nowadays, maybe even mips and x86
127 * TODO: after implementing this, it suddenly looks like overkill, but its hard to remove... 127 * TODO: after implementing this, it suddenly looks like overkill, but its hard to remove...
128 */ 128 */
129#if __GNUC__ && __linux && ECB_AMD64 129#if __GNUC__ && __linux && ECB_AMD64 && !defined __OPTIMIZE_SIZE__
130 /* the costly errno access probably kills this for size optimisation */
130 131
131 #define ev_syscall(nr,narg,arg1,arg2,arg3,arg4,arg5) \ 132 #define ev_syscall(nr,narg,arg1,arg2,arg3,arg4,arg5) \
132 ({ \ 133 ({ \
133 long res; \ 134 long res; \
134 register unsigned long r5 __asm__ ("r8" ); \ 135 register unsigned long r5 __asm__ ("r8" ); \
… …
288 ANIOCBP iocb = linuxaio_iocbps [fd]; 289 ANIOCBP iocb = linuxaio_iocbps [fd];
289 290
290 if (iocb->io.aio_reqprio < 0) 291 if (iocb->io.aio_reqprio < 0)
291 { 292 {
292 /* we handed this fd over to epoll, so undo this first */ 293 /* we handed this fd over to epoll, so undo this first */
293 /* we do it manually because the optimisations on epoll_modfy won't do us any good */ 294 /* we do it manually because the optimisations on epoll_modify won't do us any good */
294 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0); 295 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0);
295 anfds [fd].emask = 0; 296 anfds [fd].emask = 0;
296 iocb->io.aio_reqprio = 0; 297 iocb->io.aio_reqprio = 0;
297 } 298 }
298 299
299 if (iocb->io.aio_buf) 300 if (iocb->io.aio_buf)
300 /* io_cancel always returns some error on relevant kernels, but works */ 301 {
301 evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); 302 evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0);
303 /* on relevant kernels, io_cancel fails with EINPROGRES if everything is fine */
304 assert (("libev: linuxaio unexpected io_cancel failed", errno != EINPROGRESS));
305 }
302 306
303 if (nev) 307 if (nev)
304 { 308 {
305 iocb->io.aio_buf = 309 iocb->io.aio_buf =
306 (nev & EV_READ ? POLLIN : 0) 310 (nev & EV_READ ? POLLIN : 0)
… …
424 /* ignored */; 428 /* ignored */;
425 else 429 else
426 ev_syserr ("(libev) linuxaio io_getevents"); 430 ev_syserr ("(libev) linuxaio io_getevents");
427 else if (res) 431 else if (res)
428 { 432 {
429 /* at least one event received, handle it and any remaining ones in the ring buffer */ 433 /* at least one event available, handle it and any remaining ones in the ring buffer */
430 linuxaio_parse_events (EV_A_ ioev, res); 434 linuxaio_parse_events (EV_A_ ioev, res);
431 linuxaio_get_events_from_ring (EV_A); 435 linuxaio_get_events_from_ring (EV_A);
432 } 436 }
433} 437}
434 438
435static int 439inline_size
440int
436linuxaio_io_setup (EV_P) 441linuxaio_io_setup (EV_P)
437{ 442{
438 linuxaio_ctx = 0; 443 linuxaio_ctx = 0;
439 return evsys_io_setup (linuxaio_nr_events (EV_A), &linuxaio_ctx); 444 return evsys_io_setup (linuxaio_nr_events (EV_A), &linuxaio_ctx);
440} 445}
… …
506 /* it's easiest to handle this mess in another iteration */ 511 /* it's easiest to handle this mess in another iteration */
507 return; 512 return;
508 } 513 }
509 else if (errno == EBADF) 514 else if (errno == EBADF)
510 { 515 {
516 assert (("libev: event loop rejected bad fd", errno != EBADF));
511 fd_kill (EV_A_ linuxaio_submits [submitted]->aio_fildes); 517 fd_kill (EV_A_ linuxaio_submits [submitted]->aio_fildes);
512 518
513 res = 1; /* skip this iocb */ 519 res = 1; /* skip this iocb */
514 } 520 }
515 else 521 else
… …
568void 574void
569linuxaio_destroy (EV_P) 575linuxaio_destroy (EV_P)
570{ 576{
571 epoll_destroy (EV_A); 577 epoll_destroy (EV_A);
572 linuxaio_free_iocbp (EV_A); 578 linuxaio_free_iocbp (EV_A);
573 evsys_io_destroy (linuxaio_ctx); 579 evsys_io_destroy (linuxaio_ctx); /* fails in child, aio context is destroyed */
574} 580}
575 581
576inline_size 582inline_size
577void 583void
578linuxaio_fork (EV_P) 584linuxaio_fork (EV_P)
… …
584 linuxaio_iteration = 0; /* we start over in the child */ 590 linuxaio_iteration = 0; /* we start over in the child */
585 591
586 while (linuxaio_io_setup (EV_A) < 0) 592 while (linuxaio_io_setup (EV_A) < 0)
587 ev_syserr ("(libev) linuxaio io_setup"); 593 ev_syserr ("(libev) linuxaio io_setup");
588 594
595 /* forking epoll should also effectively unregister all fds from the backend */
589 epoll_fork (EV_A); 596 epoll_fork (EV_A);
590 597
591 ev_io_stop (EV_A_ &linuxaio_epoll_w); 598 ev_io_stop (EV_A_ &linuxaio_epoll_w);
592 ev_io_set (EV_A_ &linuxaio_epoll_w, backend_fd, EV_READ); 599 ev_io_set (EV_A_ &linuxaio_epoll_w, backend_fd, EV_READ);
593 ev_io_start (EV_A_ &linuxaio_epoll_w); 600 ev_io_start (EV_A_ &linuxaio_epoll_w);

Diff Legend

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