*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 9647e1659da2f3cbf92fa1121d0d0b84cdefed7c..1a4e5f16a459a1d96da354f7df4c153e4a754fb8 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -974,9 +974,13 @@ ev_recommended_backends (void)
 unsigned int
 ev_embeddable_backends (void)
 {
 unsigned int
 ev_embeddable_backends (void)
 {

+  int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
+

   /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
   /* epoll embeddability broken on all linux versions up to at least 2.6.23 */

-  return EVBACKEND_KQUEUE
-       | EVBACKEND_PORT;
+  /* please fix it and tell me how to detect the fix */
+  flags &= ~EVBACKEND_EPOLL;
+
+  return flags;

 }
 
 unsigned int
 }
 
 unsigned int


@@ -2268,7 +2272,7 @@ embed_io_cb (EV_P_ ev_io *io, int revents)
   if (ev_cb (w))
     ev_feed_event (EV_A_ (W)w, EV_EMBED);
   else
   if (ev_cb (w))
     ev_feed_event (EV_A_ (W)w, EV_EMBED);
   else

-    ev_embed_sweep (loop, w);
+    ev_loop (w->other, EVLOOP_NONBLOCK);

 }
 
 static void
 }
 
 static void


@@ -2276,8 +2280,24 @@ embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
 {
   ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
 
 {
   ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
 

-  fd_reify (w->other);
+  {
+    struct ev_loop *loop = w->other;
+
+    while (fdchangecnt)
+      {
+        fd_reify (EV_A);
+        ev_loop (EV_A_ EVLOOP_NONBLOCK);
+      }
+  }
+}
+
+#if 0
+static void
+embed_idle_cb (EV_P_ ev_idle *idle, int revents)
+{
+  ev_idle_stop (EV_A_ idle);

 }
 }

+#endif

 
 void
 ev_embed_start (EV_P_ ev_embed *w)
 
 void
 ev_embed_start (EV_P_ ev_embed *w)


@@ -2298,6 +2318,8 @@ ev_embed_start (EV_P_ ev_embed *w)
   ev_set_priority (&w->prepare, EV_MINPRI);
   ev_prepare_start (EV_A_ &w->prepare);
 
   ev_set_priority (&w->prepare, EV_MINPRI);
   ev_prepare_start (EV_A_ &w->prepare);
 

+  /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
+

   ev_start (EV_A_ (W)w, 1);
 }
 
   ev_start (EV_A_ (W)w, 1);
 }