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

Comparing libev/event.c (file contents):
Revision 1.44 by root, Sat Oct 16 06:46:55 2010 UTC vs.
Revision 1.48 by root, Wed Nov 10 12:44:22 2010 UTC

 void event_base_free (struct event_base *base)
 {
   dLOOPbase;
 #if EV_MULTIPLICITY
-  if (ev_default_loop (EVFLAG_AUTO) != loop)
+  if (!is_default_loop (loop))
     ev_loop_destroy (loop);
 #endif
 }
 int event_dispatch (void)
 }
 static void
 ev_x_cb (struct event *ev, int revents)
 {
-  revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
+  revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
   ev->ev_res = revents;
   ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
 }
   if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
     {
       revents |= EV_TIMEOUT;
       if (tv)
-        EV_TV_SET (tv, ev_now (EV_A)); /* not sure if this is right :) */
+        {
+          ev_tstamp at = ev_now (EV_A);
+          tv->tv_sec  = (long)at;
+          tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
+        }
     }
   return events & revents;
 }
 int event_base_loop (struct event_base *base, int flags)
 {
   dLOOPbase;
-  ev_loop (EV_A_ flags);
+  ev_run (EV_A_ flags);
   return 0;
 }
 int event_base_dispatch (struct event_base *base)
 static void
 ev_x_loopexit_cb (int revents, void *base)
 {
   dLOOPbase;
-  ev_unloop (EV_A_ EVUNLOOP_ONE);
+  ev_break (EV_A_ EVBREAK_ONE);
 }
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
 {
   ev_tstamp after = ev_tv_get (tv);

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