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.48 by root, Mon Jul 8 03:00:09 2019 UTC vs.
Revision 1.49 by root, Tue Jul 9 00:04:35 2019 UTC

… …
212 * this is not well documented, so we better do it. 212 * this is not well documented, so we better do it.
213 */ 213 */
214 memset (iocb, 0, sizeof (*iocb)); 214 memset (iocb, 0, sizeof (*iocb));
215 215
216 iocb->io.aio_lio_opcode = IOCB_CMD_POLL; 216 iocb->io.aio_lio_opcode = IOCB_CMD_POLL;
217 iocb->io.aio_data = offset;
218 iocb->io.aio_fildes = offset; 217 iocb->io.aio_fildes = offset;
219 218
220 base [offset++] = iocb; 219 base [offset++] = iocb;
221 } 220 }
222} 221}
… …
234static void 233static void
235linuxaio_modify (EV_P_ int fd, int oev, int nev) 234linuxaio_modify (EV_P_ int fd, int oev, int nev)
236{ 235{
237 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp); 236 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp);
238 ANIOCBP iocb = linuxaio_iocbps [fd]; 237 ANIOCBP iocb = linuxaio_iocbps [fd];
238 ANFD *anfd = &anfds [fd];
239 239
240 if (ecb_expect_false (iocb->io.aio_reqprio < 0)) 240 if (ecb_expect_false (iocb->io.aio_reqprio < 0))
241 { 241 {
242 /* we handed this fd over to epoll, so undo this first */ 242 /* we handed this fd over to epoll, so undo this first */
243 /* we do it manually because the optimisations on epoll_modify won't do us any good */ 243 /* we do it manually because the optimisations on epoll_modify won't do us any good */
244 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0); 244 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0);
245 anfds [fd].emask = 0; 245 anfd->emask = 0;
246 iocb->io.aio_reqprio = 0; 246 iocb->io.aio_reqprio = 0;
247 } 247 }
248 else if (ecb_expect_false (iocb->io.aio_buf)) 248 else if (ecb_expect_false (iocb->io.aio_buf))
249 { 249 {
250 /* iocb active, so cancel it first before resubmit */ 250 /* iocb active, so cancel it first before resubmit */
251 /* this assumes we only ever get one call per fd per loop iteration */
251 for (;;) 252 for (;;)
252 { 253 {
253 /* on all relevant kernels, io_cancel fails with EINPROGRESS on "success" */ 254 /* on all relevant kernels, io_cancel fails with EINPROGRESS on "success" */
254 if (ecb_expect_false (evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0) == 0)) 255 if (ecb_expect_false (evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0) == 0))
255 break; 256 break;
… …
262 { 263 {
263 assert (("libev: linuxaio unexpected io_cancel failed", errno != EINTR && errno != EINPROGRESS)); 264 assert (("libev: linuxaio unexpected io_cancel failed", errno != EINTR && errno != EINPROGRESS));
264 break; 265 break;
265 } 266 }
266 } 267 }
268
269 /* increment generation counter to avoid handling old events */
270 ++anfd->egen;
267 } 271 }
268 272
269 iocb->io.aio_buf = 273 iocb->io.aio_buf =
270 (nev & EV_READ ? POLLIN : 0) 274 (nev & EV_READ ? POLLIN : 0)
271 | (nev & EV_WRITE ? POLLOUT : 0); 275 | (nev & EV_WRITE ? POLLOUT : 0);
272 276
273 if (nev) 277 if (nev)
274 { 278 {
279 iocb->io.aio_data = (uint32_t)fd | ((__u64)(uint32_t)anfd->egen << 32);
280
275 /* queue iocb up for io_submit */ 281 /* queue iocb up for io_submit */
276 /* this assumes we only ever get one call per fd per loop iteration */ 282 /* this assumes we only ever get one call per fd per loop iteration */
277 ++linuxaio_submitcnt; 283 ++linuxaio_submitcnt;
278 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit); 284 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit);
279 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io; 285 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io;
… …
298static void 304static void
299linuxaio_parse_events (EV_P_ struct io_event *ev, int nr) 305linuxaio_parse_events (EV_P_ struct io_event *ev, int nr)
300{ 306{
301 while (nr) 307 while (nr)
302 { 308 {
303 int fd = ev->data; 309 int fd = ev->data & 0xffffffff;
310 uint32_t gen = ev->data >> 32;
304 int res = ev->res; 311 int res = ev->res;
305 312
306 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax)); 313 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
314
315 /* ignore event if generation doesn't match */
316 if (ecb_expect_false (gen != (uint32_t)anfds [fd].egen))
317 continue;
307 318
308 /* feed events, we do not expect or handle POLLNVAL */ 319 /* feed events, we do not expect or handle POLLNVAL */
309 fd_event ( 320 fd_event (
310 EV_A_ 321 EV_A_
311 fd, 322 fd,

Diff Legend

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