[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.194 by root, Sat Dec 22 07:03:31 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC

 }
 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 */
-  return EVBACKEND_KQUEUE
+  /* please fix it and tell me how to detect the fix */
-       | EVBACKEND_PORT;
+  flags &= ~EVBACKEND_EPOLL;
+  return flags;
 }
 unsigned int
 ev_backend (EV_P)
 {
   ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
   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
 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);
+  {
+    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)
 {
   if (expect_false (ev_is_active (w)))
   ev_prepare_init (&w->prepare, embed_prepare_cb);
   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);
 }
 void
 ev_embed_stop (EV_P_ ev_embed *w)

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