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.4 by root, Fri Jun 21 03:14:25 2019 UTC vs.
Revision 1.23 by root, Mon Jun 24 21:34:47 2019 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#define EPOLL_FALLBACK 1
41
40#include <sys/time.h> /* actually linux/time.h, but we must assume they are compatible */ 42#include <sys/time.h> /* actually linux/time.h, but we must assume they are compatible */
41#include <poll.h> 43#include <poll.h>
42#include <linux/aio_abi.h> 44#include <linux/aio_abi.h>
43 45
46#if EPOLL_FALLBACK
47# include <sys/epoll.h>
48#endif
49
44/* we try to fill 4kn pages exactly. 50/* we try to fill 4kB pages exactly.
45 * the ring buffer header is 32 bytes, every io event is 32 bytes. 51 * the ring buffer header is 32 bytes, every io event is 32 bytes.
46 * the kernel takes the io event number, doubles it, adds 2, adds the ring buffer 52 * the kernel takes the io event number, doubles it, adds 2, adds the ring buffer.
47 * so the calculation below will use "exactly" 8kB for the ring buffer 53 * therefore the calculation below will use "exactly" 4kB for the ring buffer
48 */ 54 */
49#define EV_LINUXAIO_DEPTH (256 / 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 */
50 56
51/*****************************************************************************/ 57/*****************************************************************************/
52/* syscall wrapdadoop */ 58/* syscall wrapdadoop - this section has the raw syscall definitions */
53 59
54#include <sys/syscall.h> /* no glibc wrappers */ 60#include <sys/syscall.h> /* no glibc wrappers */
55 61
56/* aio_abi.h is not verioned 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 */
57#define IOCB_CMD_POLL 5 63#define IOCB_CMD_POLL 5
58 64
59/* taken from linux/fs/aio.c */ 65/* taken from linux/fs/aio.c */
60#define AIO_RING_MAGIC 0xa10a10a1 66#define AIO_RING_MAGIC 0xa10a10a1
61#define AIO_RING_INCOMPAT_FEATURES 0 67#define AIO_RING_INCOMPAT_FEATURES 0
… …
72 unsigned header_length; /* size of aio_ring */ 78 unsigned header_length; /* size of aio_ring */
73 79
74 struct io_event io_events[0]; 80 struct io_event io_events[0];
75}; 81};
76 82
77static int 83inline_size
84int
78ev_io_setup (unsigned nr_events, aio_context_t *ctx_idp) 85evsys_io_setup (unsigned nr_events, aio_context_t *ctx_idp)
79{ 86{
80 return syscall (SYS_io_setup, nr_events, ctx_idp); 87 return syscall (SYS_io_setup, nr_events, ctx_idp);
81} 88}
82 89
83static int 90inline_size
91int
84ev_io_destroy (aio_context_t ctx_id) 92evsys_io_destroy (aio_context_t ctx_id)
85{ 93{
86 return syscall (SYS_io_destroy, ctx_id); 94 return syscall (SYS_io_destroy, ctx_id);
87} 95}
88 96
89static int 97inline_size
98int
90ev_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[])
91{ 100{
92 return syscall (SYS_io_submit, ctx_id, nr, cbp); 101 return syscall (SYS_io_submit, ctx_id, nr, cbp);
93} 102}
94 103
95static int 104inline_size
105int
96ev_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)
97{ 107{
98 return syscall (SYS_io_cancel, ctx_id, cbp, result); 108 return syscall (SYS_io_cancel, ctx_id, cbp, result);
99} 109}
100 110
101static int 111inline_size
112int
102ev_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)
103{ 114{
104 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);
105} 116}
106
107typedef void (*ev_io_cb) (long nr, struct io_event *events);
108 117
109/*****************************************************************************/ 118/*****************************************************************************/
110/* actual backed implementation */ 119/* actual backed implementation */
111 120
112/* two iocbs for every fd, one for read, one for write */ 121/* we use out own wrapper structure in acse we ever want to do something "clever" */
113typedef struct aniocb 122typedef struct aniocb
114{ 123{
115 struct iocb io; 124 struct iocb io;
116 /*int inuse;*/ 125 /*int inuse;*/
117} *ANIOCBP; 126} *ANIOCBP;
118 127
119inline_size 128inline_size
120void 129void
121linuxaio_array_needsize_iocbp (ANIOCBP *base, int count) 130linuxaio_array_needsize_iocbp (ANIOCBP *base, int offset, int count)
122{ 131{
123 /* TODO: quite the overhead to allocate every iocb separately */
124 while (count--) 132 while (count--)
125 { 133 {
134 /* TODO: quite the overhead to allocate every iocb separately, maybe use our own alocator? */
126 *base = (ANIOCBP)ev_malloc (sizeof (**base)); 135 ANIOCBP iocb = (ANIOCBP)ev_malloc (sizeof (*iocb));
127 /* 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 */
128 memset (*base, 0, sizeof (**base)); 140 memset (iocb, 0, sizeof (*iocb));
129 /* would be nice to initialize fd/data as well */ 141
130 (*base)->io.aio_lio_opcode = IOCB_CMD_POLL; 142 iocb->io.aio_lio_opcode = IOCB_CMD_POLL;
131 ++base; 143 iocb->io.aio_data = offset;
132 } 144 iocb->io.aio_fildes = offset;
133}
134 145
146 base [offset++] = iocb;
147 }
148}
149
150ecb_cold
135static void 151static void
136linuxaio_free_iocbp (EV_P) 152linuxaio_free_iocbp (EV_P)
137{ 153{
138 while (linuxaio_iocbpmax--) 154 while (linuxaio_iocbpmax--)
139 ev_free (linuxaio_iocbps [linuxaio_iocbpmax]); 155 ev_free (linuxaio_iocbps [linuxaio_iocbpmax]);
140 156
141 /* next resize will completely reallocate the array */ 157 linuxaio_iocbpmax = 0; /* next resize will completely reallocate the array, at some overhead */
142 linuxaio_iocbpmax = 0;
143 linuxaio_submitcnt = 0; /* all pointers invalidated */
144} 158}
145 159
146static void 160static void
147linuxaio_modify (EV_P_ int fd, int oev, int nev) 161linuxaio_modify (EV_P_ int fd, int oev, int nev)
148{ 162{
149 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);
150 struct aniocb *iocb = linuxaio_iocbps [fd]; 164 ANIOCBP iocb = linuxaio_iocbps [fd];
165
166#if EPOLL_FALLBACK
167 if (iocb->io.aio_reqprio < 0)
168 {
169 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0);
170 iocb->io.aio_reqprio = 0;
171 }
172#endif
151 173
152 if (iocb->io.aio_buf) 174 if (iocb->io.aio_buf)
153 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 */
154 176
155 if (nev) 177 if (nev)
156 { 178 {
157 iocb->io.aio_data = fd;
158 iocb->io.aio_fildes = fd;
159 iocb->io.aio_buf = 179 iocb->io.aio_buf =
160 (nev & EV_READ ? POLLIN : 0) 180 (nev & EV_READ ? POLLIN : 0)
161 | (nev & EV_WRITE ? POLLOUT : 0); 181 | (nev & EV_WRITE ? POLLOUT : 0);
162 182
163 /* queue iocb up for io_submit */ 183 /* queue iocb up for io_submit */
164 /* 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 */
… …
166 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);
167 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io; 187 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io;
168 } 188 }
169} 189}
170 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
171static void 243static void
172linuxaio_parse_events (EV_P_ struct io_event *ev, int nr) 244linuxaio_parse_events (EV_P_ struct io_event *ev, int nr)
173{ 245{
174 while (nr) 246 while (nr)
175 { 247 {
176 int fd = ev->data; 248 int fd = ev->data;
177 int res = ev->res; 249 int res = ev->res;
178 250
179 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));
180 252
181 /* linux aio is oneshot: rearm fd */ 253 /* linux aio is oneshot: rearm fd. TODO: this does more work than needed */
182 linuxaio_iocbps [fd]->io.aio_buf = 0; 254 linuxaio_iocbps [fd]->io.aio_buf = 0;
183 anfds [fd].events = 0; 255 anfds [fd].events = 0;
184 fd_change (EV_A_ fd, 0); 256 fd_change (EV_A_ fd, 0);
185 257
186 /* feed events, we do not expect or handle POLLNVAL */ 258 /* feed events, we do not expect or handle POLLNVAL */
187 if (ecb_expect_false (res & POLLNVAL))
188 fd_kill (EV_A_ fd);
189 else
190 fd_event ( 259 fd_event (
191 EV_A_ 260 EV_A_
192 fd, 261 fd,
193 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) 262 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
194 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) 263 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
195 ); 264 );
196 265
197 --nr; 266 --nr;
198 ++ev; 267 ++ev;
199 } 268 }
200} 269}
… …
203static int 272static int
204linuxaio_get_events_from_ring (EV_P) 273linuxaio_get_events_from_ring (EV_P)
205{ 274{
206 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx; 275 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx;
207 276
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;
281 unsigned tail = *(volatile unsigned *)&ring->tail;
282
283 if (head == tail)
284 return 0;
285
286 /* bail out if the ring buffer doesn't match the expected layout */
287 if (expect_false (ring->magic != AIO_RING_MAGIC)
288 || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
289 || ring->header_length != sizeof (struct aio_ring)) /* TODO: or use it to find io_event[0]? */
290 return 0;
291
292 /* make sure the events up to tail are visible */
208 ECB_MEMORY_FENCE_ACQUIRE; 293 ECB_MEMORY_FENCE_ACQUIRE;
209
210 unsigned head = ring->head;
211 unsigned tail = *(volatile unsigned *)&ring->tail;
212
213 if (ring->magic != AIO_RING_MAGIC
214 || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
215 || ring->header_length != sizeof (struct aio_ring) /* TODO: or use it to find io_event[0]? */
216 || head == tail)
217 return 0;
218 294
219 /* parse all available events, but only once, to avoid starvation */ 295 /* parse all available events, but only once, to avoid starvation */
220 if (tail > head) /* normal case around */ 296 if (tail > head) /* normal case around */
221 linuxaio_parse_events (EV_A_ ring->io_events + head, tail - head); 297 linuxaio_parse_events (EV_A_ ring->io_events + head, tail - head);
222 else
223 {
224 /* wrapped around */ 298 else /* wrapped around */
299 {
225 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);
226 linuxaio_parse_events (EV_A_ ring->io_events, tail); 301 linuxaio_parse_events (EV_A_ ring->io_events, tail);
227 } 302 }
228 303
229 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;
230 310
231 return 1; 311 return 1;
232} 312}
233 313
234/* read at least one event from kernel, or timeout */ 314/* read at least one event from kernel, or timeout */
235inline_size 315inline_size
236void 316void
237linuxaio_get_events (EV_P_ ev_tstamp timeout) 317linuxaio_get_events (EV_P_ ev_tstamp timeout)
238{ 318{
239 struct timespec ts; 319 struct timespec ts;
240 struct io_event ioev; 320 struct io_event ioev[1];
241 int res; 321 int res;
242 322
243 if (linuxaio_get_events_from_ring (EV_A)) 323 if (linuxaio_get_events_from_ring (EV_A))
244 return; 324 return;
245 325
246 /* 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 */
247 /* this degraded to one event per loop iteration */ 327 /* this degrades to one event per loop iteration */
248 /* if the ring buffer changes layout, but so be it */ 328 /* if the ring buffer changes layout, but so be it */
329
330 EV_RELEASE_CB;
249 331
250 ts.tv_sec = (long)timeout; 332 ts.tv_sec = (long)timeout;
251 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9); 333 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9);
252 334
253 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;
254 338
255 if (res < 0) 339 if (res < 0)
340 if (errno == EINTR)
341 /* ignored */;
342 else
256 ev_syserr ("(libev) io_getevents"); 343 ev_syserr ("(libev) linuxaio io_getevents");
257 else if (res) 344 else if (res)
258 { 345 {
259 /* 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 */
260 linuxaio_parse_events (EV_A_ &ioev, 1); 347 linuxaio_parse_events (EV_A_ ioev, res);
261 linuxaio_get_events_from_ring (EV_A); 348 linuxaio_get_events_from_ring (EV_A);
262 } 349 }
263} 350}
264 351
265static void 352static void
… …
272 /* io_submit might return less than the requested number of iocbs */ 359 /* io_submit might return less than the requested number of iocbs */
273 /* 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, */
274 /* which allows us to pinpoint the errornous iocb */ 361 /* which allows us to pinpoint the errornous iocb */
275 for (submitted = 0; submitted < linuxaio_submitcnt; ) 362 for (submitted = 0; submitted < linuxaio_submitcnt; )
276 { 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
277 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
278 373
279 if (res < 0) 374 if (expect_false (res < 0))
280 if (errno == EAGAIN) 375 if (errno == EAGAIN)
281 { 376 {
282 /* 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
283 * that the event was queued synchronously during io_submit, and thus 378 * that the event was queued synchronously during io_submit, and thus
284 * the buffer overflowd. 379 * the buffer overflowed.
285 * In this case, we just try next loop iteration. 380 * In this case, we just try in next loop iteration.
381 * This should not result in a few fds taking priority, as the interface
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?
286 */ 384 */
385 if (ecb_expect_false (submitted))
386 {
287 memcpy (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits)); 387 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits));
288 linuxaio_submitcnt -= submitted; 388 linuxaio_submitcnt -= submitted;
389 }
390
289 timeout = 0; 391 timeout = 0;
290 break; 392 break;
291 } 393 }
394#if EPOLL_FALLBACK
395 else if (errno == EINVAL)
396 {
397 /* This happens for unsupported fds, officially, but in my testing,
398 * also randomly happens for supported fds. We fall back to good old
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.
403 */
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
409 res = 1; /* skip this iocb */
410 }
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 }
292 else 418 else
293 /* TODO: we get EAGAIN when the ring buffer is full for some reason */
294 /* TODO: should we always just try next time? */
295 ev_syserr ("(libev) io_submit"); 419 ev_syserr ("(libev) linuxaio io_submit");
296 420
297 submitted += res; 421 submitted += res;
298 } 422 }
299 423
300 linuxaio_submitcnt = 0; 424 linuxaio_submitcnt = 0;
… …
308int 432int
309linuxaio_init (EV_P_ int flags) 433linuxaio_init (EV_P_ int flags)
310{ 434{
311 /* 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 */
312 /* 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 */
313 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)
314 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
315 446
316 linuxaio_ctx = 0; 447 linuxaio_ctx = 0;
317 if (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 448 if (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
318 return 0; 449 return 0;
450
451#if EPOLL_FALLBACK
452 backend_fd = ev_epoll_create ();
453 if (backend_fd < 0)
454 {
455 evsys_io_destroy (linuxaio_ctx);
456 return 0;
457 }
458
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);
461 ev_io_start (EV_A_ &linuxaio_epoll_w);
462 ev_unref (EV_A); /* watcher should not keep loop alive */
463#endif
319 464
320 backend_modify = linuxaio_modify; 465 backend_modify = linuxaio_modify;
321 backend_poll = linuxaio_poll; 466 backend_poll = linuxaio_poll;
322 467
323 linuxaio_iocbpmax = 0; 468 linuxaio_iocbpmax = 0;
… …
332 477
333inline_size 478inline_size
334void 479void
335linuxaio_destroy (EV_P) 480linuxaio_destroy (EV_P)
336{ 481{
482#if EPOLL_FALLBACK
483 close (backend_fd);
484#endif
337 linuxaio_free_iocbp (EV_A); 485 linuxaio_free_iocbp (EV_A);
338 ev_io_destroy (linuxaio_ctx); 486 evsys_io_destroy (linuxaio_ctx);
339} 487}
340 488
341inline_size 489inline_size
342void 490void
343linuxaio_fork (EV_P) 491linuxaio_fork (EV_P)
344{ 492{
345 /* TODO: verify and test */ 493 /* this frees all iocbs, which is very heavy-handed */
346 linuxaio_destroy (EV_A); 494 linuxaio_destroy (EV_A);
495 linuxaio_submitcnt = 0; /* all pointers were invalidated */
347 496
348 linuxaio_ctx = 0; 497 linuxaio_ctx = 0;
349 while (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 498 while (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
350 ev_syserr ("(libev) io_setup"); 499 ev_syserr ("(libev) linuxaio io_setup");
500
501#if EPOLL_FALLBACK
502 while ((backend_fd = ev_epoll_create ()) < 0)
503 ev_syserr ("(libev) linuxaio epoll_create");
504
505 ev_io_stop (EV_A_ &linuxaio_epoll_w);
506 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
507 ev_io_start (EV_A_ &linuxaio_epoll_w);
508#endif
351 509
352 fd_rearm_all (EV_A); 510 fd_rearm_all (EV_A);
353} 511}
354 512

Diff Legend

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