X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/ebc0759db57ff79951aa13a23c97c5846a78a67d..73861ad6c4342633fff7dcd5913bcaa2749dba09:/ev.c?ds=sidebyside diff --git a/ev.c b/ev.c index 32369d3..3f9fe2b 100644 --- a/ev.c +++ b/ev.c @@ -927,8 +927,8 @@ ev_recommended_backends (void) unsigned int ev_embeddable_backends (void) { - return EVBACKEND_EPOLL - | EVBACKEND_KQUEUE + /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ + return EVBACKEND_KQUEUE | EVBACKEND_PORT; } @@ -2188,7 +2188,7 @@ ev_embed_sweep (EV_P_ ev_embed *w) } static void -embed_cb (EV_P_ ev_io *io, int revents) +embed_io_cb (EV_P_ ev_io *io, int revents) { ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); @@ -2198,6 +2198,14 @@ embed_cb (EV_P_ ev_io *io, int revents) ev_embed_sweep (loop, w); } +static void +embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) +{ + ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); + + fd_reify (w->other); +} + void ev_embed_start (EV_P_ ev_embed *w) { @@ -2207,12 +2215,16 @@ ev_embed_start (EV_P_ ev_embed *w) { struct ev_loop *loop = w->other; assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); - ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); + ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); } ev_set_priority (&w->io, ev_priority (w)); ev_io_start (EV_A_ &w->io); + ev_prepare_init (&w->prepare, embed_prepare_cb); + ev_set_priority (&w->prepare, EV_MINPRI); + ev_prepare_start (EV_A_ &w->prepare); + ev_start (EV_A_ (W)w, 1); } @@ -2224,6 +2236,7 @@ ev_embed_stop (EV_P_ ev_embed *w) return; ev_io_stop (EV_A_ &w->io); + ev_prepare_stop (EV_A_ &w->prepare); ev_stop (EV_A_ (W)w); }