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.17 by root, Mon Jun 24 02:02:35 2019 UTC vs.
Revision 1.21 by root, Mon Jun 24 20:44:15 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/*****************************************************************************/
… …
164 iocb->io.aio_reqprio = 0; 164 iocb->io.aio_reqprio = 0;
165 } 165 }
166#endif 166#endif
167 167
168 if (iocb->io.aio_buf) 168 if (iocb->io.aio_buf)
169 ev_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); /* always returns an error relevant kernels */ 169 evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); /* always returns an error relevant kernels */
170 170
171 if (nev) 171 if (nev)
172 { 172 {
173 iocb->io.aio_data = fd; 173 iocb->io.aio_data = fd;
174 iocb->io.aio_fildes = fd; 174 iocb->io.aio_fildes = fd;
… …
182 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit); 182 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit);
183 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io; 183 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io;
184 } 184 }
185} 185}
186 186
187#if EPOLL_FALLBACK
188
189static void
190linuxaio_rearm_epoll (EV_P_ struct iocb *iocb, int op)
191{
192 struct epoll_event eev;
193
194 eev.events = EPOLLONESHOT;
195 if (iocb->aio_buf & POLLIN ) eev.events |= EPOLLIN ;
196 if (iocb->aio_buf & POLLOUT) eev.events |= EPOLLOUT;
197 eev.data.fd = iocb->aio_fildes;
198
199 if (epoll_ctl (backend_fd, op, iocb->aio_fildes, &eev) < 0)
200 ev_syserr ("(libeio) linuxaio epoll_ctl");
201}
202
203static void
204linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents)
205{
206 struct epoll_event events[16];
207
208 for (;;)
209 {
210 int idx;
211 int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
212
213 if (expect_false (res < 0))
214 ev_syserr ("(libev) linuxaio epoll_wait");
215 else if (!res)
216 break;
217
218 for (idx = res; idx--; )
219 {
220 int fd = events [idx].data.fd;
221 uint32_t ev = events [idx].events;
222
223 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
224
225 linuxaio_rearm_epoll (EV_A_ &linuxaio_iocbps [fd]->io, EPOLL_CTL_MOD);
226
227 fd_event (EV_A_ fd,
228 (ev & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
229 | (ev & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0));
230 }
231
232 if (res < sizeof (events) / sizeof (events [0]))
233 break;
234 }
235}
236
237#endif
238
187static void 239static void
188linuxaio_parse_events (EV_P_ struct io_event *ev, int nr) 240linuxaio_parse_events (EV_P_ struct io_event *ev, int nr)
189{ 241{
190 while (nr) 242 while (nr)
191 { 243 {
192 int fd = ev->data; 244 int fd = ev->data;
193 int res = ev->res; 245 int res = ev->res;
194 246
195 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax)); 247 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
196 248
197 /* linux aio is oneshot: rearm fd */ 249 /* linux aio is oneshot: rearm fd. TODO: this does more work than needed */
198 linuxaio_iocbps [fd]->io.aio_buf = 0; 250 linuxaio_iocbps [fd]->io.aio_buf = 0;
199 anfds [fd].events = 0; 251 anfds [fd].events = 0;
200 fd_change (EV_A_ fd, 0); 252 fd_change (EV_A_ fd, 0);
201 253
202 /* feed events, we do not expect or handle POLLNVAL */ 254 /* feed events, we do not expect or handle POLLNVAL */
203 if (expect_false (res & POLLNVAL))
204 fd_kill (EV_A_ fd);
205 else
206 fd_event ( 255 fd_event (
207 EV_A_ 256 EV_A_
208 fd, 257 fd,
209 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) 258 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
210 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) 259 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
211 ); 260 );
212 261
213 --nr; 262 --nr;
214 ++ev; 263 ++ev;
215 } 264 }
216} 265}
… …
262inline_size 311inline_size
263void 312void
264linuxaio_get_events (EV_P_ ev_tstamp timeout) 313linuxaio_get_events (EV_P_ ev_tstamp timeout)
265{ 314{
266 struct timespec ts; 315 struct timespec ts;
267 struct io_event ioev; 316 struct io_event ioev[1];
268 int res; 317 int res;
269 318
270 if (linuxaio_get_events_from_ring (EV_A)) 319 if (linuxaio_get_events_from_ring (EV_A))
271 return; 320 return;
272 321
273 /* no events, so wait for at least one, then poll ring buffer again */ 322 /* no events, so wait for at least one, then poll ring buffer again */
274 /* this degrades to one event per loop iteration */ 323 /* this degrades to one event per loop iteration */
275 /* if the ring buffer changes layout, but so be it */ 324 /* if the ring buffer changes layout, but so be it */
276 325
326 EV_RELEASE_CB;
327
277 ts.tv_sec = (long)timeout; 328 ts.tv_sec = (long)timeout;
278 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9); 329 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9);
279 330
280 res = ev_io_getevents (linuxaio_ctx, 1, 1, &ioev, &ts); 331 res = evsys_io_getevents (linuxaio_ctx, 1, sizeof (ioev) / sizeof (ioev [0]), ioev, &ts);
332
333 EV_ACQUIRE_CB;
281 334
282 if (res < 0) 335 if (res < 0)
283 if (errno == EINTR) 336 if (errno == EINTR)
284 /* ignored */; 337 /* ignored */;
285 else 338 else
286 ev_syserr ("(libev) linuxaio io_getevents"); 339 ev_syserr ("(libev) linuxaio io_getevents");
287 else if (res) 340 else if (res)
288 { 341 {
289 /* at least one event received, handle it and any remaining ones in the ring buffer */ 342 /* at least one event received, handle it and any remaining ones in the ring buffer */
290 linuxaio_parse_events (EV_A_ &ioev, 1); 343 linuxaio_parse_events (EV_A_ ioev, res);
291 linuxaio_get_events_from_ring (EV_A); 344 linuxaio_get_events_from_ring (EV_A);
292 } 345 }
293} 346}
294
295#if EPOLL_FALLBACK
296static void
297linuxaio_rearm_epoll (EV_P_ struct iocb *iocb, int op)
298{
299 struct epoll_event eev;
300
301 eev.events = EPOLLONESHOT;
302 if (iocb->aio_buf & POLLIN ) eev.events |= EPOLLIN ;
303 if (iocb->aio_buf & POLLOUT) eev.events |= EPOLLOUT;
304 eev.data.fd = iocb->aio_fildes;
305
306 if (epoll_ctl (backend_fd, op, iocb->aio_fildes, &eev) < 0)
307 ev_syserr ("(libeio) linuxaio epoll_ctl");
308}
309#endif
310 347
311static void 348static void
312linuxaio_poll (EV_P_ ev_tstamp timeout) 349linuxaio_poll (EV_P_ ev_tstamp timeout)
313{ 350{
314 int submitted; 351 int submitted;
… …
318 /* io_submit might return less than the requested number of iocbs */ 355 /* io_submit might return less than the requested number of iocbs */
319 /* this is, afaics, only because of errors, but we go by the book and use a loop, */ 356 /* this is, afaics, only because of errors, but we go by the book and use a loop, */
320 /* which allows us to pinpoint the errornous iocb */ 357 /* which allows us to pinpoint the errornous iocb */
321 for (submitted = 0; submitted < linuxaio_submitcnt; ) 358 for (submitted = 0; submitted < linuxaio_submitcnt; )
322 { 359 {
360#if 0
361 int res;
362 if (linuxaio_submits[submitted]->aio_fildes == backend_fd)
363 res = evsys_io_submit (linuxaio_ctx, 1, linuxaio_submits + submitted);
364 else
365 { res = -1; errno = EINVAL; };
366#else
323 int res = ev_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted); 367 int res = evsys_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted);
368#endif
324 369
325 if (expect_false (res < 0)) 370 if (expect_false (res < 0))
326 if (errno == EAGAIN) 371 if (errno == EAGAIN)
327 { 372 {
328 /* This happens when the ring buffer is full, at least. I assume this means 373 /* This happens when the ring buffer is full, at least. I assume this means
329 * that the event was queued synchronously during io_submit, and thus 374 * that the event was queued synchronously during io_submit, and thus
330 * the buffer overflowed. 375 * the buffer overflowed.
331 * In this case, we just try in next loop iteration. 376 * In this case, we just try in next loop iteration.
332 * This should not result in a few fds taking priority, as the interface 377 * This should not result in a few fds taking priority, as the interface
333 * is one-shot, and we submit iocb's in a round-robin fashion. 378 * is one-shot, and we submit iocb's in a round-robin fashion.
379 * TODO: maybe make "submitted" persistent, so we don't have to memmove?
334 */ 380 */
381 if (ecb_expect_false (submitted))
382 {
335 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits)); 383 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits));
336 linuxaio_submitcnt -= submitted; 384 linuxaio_submitcnt -= submitted;
385 }
386
337 timeout = 0; 387 timeout = 0;
338 break; 388 break;
339 } 389 }
340#if EPOLL_FALLBACK 390#if EPOLL_FALLBACK
341 else if (errno == EINVAL) 391 else if (errno == EINVAL)
342 { 392 {
343 /* This happens for unsupported fds, officially, but in my testing, 393 /* This happens for unsupported fds, officially, but in my testing,
344 * also randomly happens for supported fds. We fall back to good old 394 * also randomly happens for supported fds. We fall back to good old
345 * poll() here, under the assumption that this is a very rare case. 395 * poll() here, under the assumption that this is a very rare case.
346 * See https://lore.kernel.org/patchwork/patch/1047453/ for evidence 396 * See https://lore.kernel.org/patchwork/patch/1047453/ to see
347 * that the problem is known, but ignored. 397 * discussion about such a case (ttys) where polling for POLLIN
398 * fails but POLLIN|POLLOUT works.
348 */ 399 */
349 struct iocb *iocb = linuxaio_submits [submitted]; 400 struct iocb *iocb = linuxaio_submits [submitted];
401
402 linuxaio_rearm_epoll (EV_A_ linuxaio_submits [submitted], EPOLL_CTL_ADD);
403 iocb->aio_reqprio = -1; /* mark iocb as epoll */
404
350 res = 1; /* skip this iocb */ 405 res = 1; /* skip this iocb */
351
352 linuxaio_rearm_epoll (EV_A_ iocb, EPOLL_CTL_ADD);
353 iocb->aio_reqprio = -1; /* mark iocb as epoll */
354 } 406 }
355#endif 407#endif
408 else if (errno == EBADF)
409 {
410 fd_kill (EV_A_ linuxaio_submits [submitted]->aio_fildes);
411
412 res = 1; /* skip this iocb */
413 }
356 else 414 else
357 ev_syserr ("(libev) linuxaio io_submit"); 415 ev_syserr ("(libev) linuxaio io_submit");
358 416
359 submitted += res; 417 submitted += res;
360 } 418 }
… …
363 421
364 /* second phase: fetch and parse events */ 422 /* second phase: fetch and parse events */
365 423
366 linuxaio_get_events (EV_A_ timeout); 424 linuxaio_get_events (EV_A_ timeout);
367} 425}
368
369#if EPOLL_FALLBACK
370
371static void
372linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents)
373{
374 struct epoll_event events[16];
375
376 for (;;)
377 {
378 int idx;
379 int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
380
381 if (expect_false (res < 0))
382 ev_syserr ("(libev) linuxaio epoll_wait");
383 else if (!res)
384 break;
385
386 for (idx = res; idx--; )
387 {
388 int fd = events [idx].data.fd;
389 uint32_t ev = events [idx].events;
390
391 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
392
393 linuxaio_rearm_epoll (EV_A_ &linuxaio_iocbps [fd]->io, EPOLL_CTL_MOD);
394
395 fd_event (EV_A_ fd,
396 (ev & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
397 | (ev & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0));
398 }
399
400 if (res < sizeof (events) / sizeof (events [0]))
401 break;
402 }
403}
404
405#endif
406 426
407inline_size 427inline_size
408int 428int
409linuxaio_init (EV_P_ int flags) 429linuxaio_init (EV_P_ int flags)
410{ 430{
… …
419 if (ev_linux_version () < 0x041200) 439 if (ev_linux_version () < 0x041200)
420 return 0; 440 return 0;
421#endif 441#endif
422 442
423 linuxaio_ctx = 0; 443 linuxaio_ctx = 0;
424 if (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 444 if (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
425 return 0; 445 return 0;
426 446
427#if EPOLL_FALLBACK 447#if EPOLL_FALLBACK
428 backend_fd = ev_epoll_create (); 448 backend_fd = ev_epoll_create ();
429 if (backend_fd < 0) 449 if (backend_fd < 0)
430 { 450 {
431 ev_io_destroy (linuxaio_ctx); 451 evsys_io_destroy (linuxaio_ctx);
432 return 0; 452 return 0;
433 } 453 }
434 454
435 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ); 455 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
456 ev_set_priority (&linuxaio_epoll_w, EV_MAXPRI);
436 ev_io_start (EV_A_ &linuxaio_epoll_w); 457 ev_io_start (EV_A_ &linuxaio_epoll_w);
437 ev_unref (EV_A); /* watcher should not keep loop alive */ 458 ev_unref (EV_A); /* watcher should not keep loop alive */
438#endif 459#endif
439 460
440 backend_modify = linuxaio_modify; 461 backend_modify = linuxaio_modify;
… …
456{ 477{
457#if EPOLL_FALLBACK 478#if EPOLL_FALLBACK
458 close (backend_fd); 479 close (backend_fd);
459#endif 480#endif
460 linuxaio_free_iocbp (EV_A); 481 linuxaio_free_iocbp (EV_A);
461 ev_io_destroy (linuxaio_ctx); 482 evsys_io_destroy (linuxaio_ctx);
462} 483}
463 484
464inline_size 485inline_size
465void 486void
466linuxaio_fork (EV_P) 487linuxaio_fork (EV_P)
… …
468 /* this frees all iocbs, which is very heavy-handed */ 489 /* this frees all iocbs, which is very heavy-handed */
469 linuxaio_destroy (EV_A); 490 linuxaio_destroy (EV_A);
470 linuxaio_submitcnt = 0; /* all pointers were invalidated */ 491 linuxaio_submitcnt = 0; /* all pointers were invalidated */
471 492
472 linuxaio_ctx = 0; 493 linuxaio_ctx = 0;
473 while (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 494 while (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
474 ev_syserr ("(libev) linuxaio io_setup"); 495 ev_syserr ("(libev) linuxaio io_setup");
475 496
476#if EPOLL_FALLBACK 497#if EPOLL_FALLBACK
477 while ((backend_fd = ev_epoll_create ()) < 0) 498 while ((backend_fd = ev_epoll_create ()) < 0)
478 ev_syserr ("(libev) linuxaio epoll_create"); 499 ev_syserr ("(libev) linuxaio epoll_create");

Diff Legend

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