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

Comparing libev/ev.c (file contents):
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC vs.
Revision 1.188 by root, Thu Dec 20 07:12:57 2007 UTC

 #ifndef CLOCK_REALTIME
 # undef EV_USE_REALTIME
 # define EV_USE_REALTIME 0
 #endif
+#if !EV_STAT_ENABLE
+# undef EV_USE_INOTIFY
+# define EV_USE_INOTIFY 0
+#endif
+#if EV_USE_INOTIFY
+# include <sys/inotify.h>
+#endif
 #if EV_SELECT_IS_WINSOCKET
 # include <winsock.h>
-#endif
-#if !EV_STAT_ENABLE
-# define EV_USE_INOTIFY 0
-#endif
-#if EV_USE_INOTIFY
-# include <sys/inotify.h>
 #endif
 /**/
 /*
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
 /*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
-#if __GNUC__ >= 3
+#if __GNUC__ >= 4
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define noinline                   __attribute__ ((noinline))
 #else
 # define expect(expr,value)         (expr)
 # define noinline
 #if EV_IDLE_ENABLE
       array_free (idle, [i]);
 #endif
     }
+  ev_free (anfds); anfdmax = 0;
   /* have to use the microsoft-never-gets-it-right macro */
   array_free (fdchange, EMPTY);
   array_free (timer, EMPTY);
 #if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY);
+#endif
+#if EV_FORK_ENABLE
+  array_free (fork, EMPTY);
 #endif
   array_free (prepare, EMPTY);
   array_free (check, EMPTY);
   backend = 0;
 #if EV_EMBED_ENABLE
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {
-  ev_loop (w->loop, EVLOOP_NONBLOCK);
+  ev_loop (w->other, EVLOOP_NONBLOCK);
 }
 static void
 embed_cb (EV_P_ ev_io *io, int revents)
 {
 {
   if (expect_false (ev_is_active (w)))
     return;
   {
-    struct ev_loop *loop = w->loop;
+    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_set_priority (&w->io, ev_priority (w));
       ev_timer_set (&once->to, timeout, 0.);
       ev_timer_start (EV_A_ &once->to);
     }
 }
+#if EV_MULTIPLICITY
+  #include "ev_wrap.h"
+#endif
 #ifdef __cplusplus
 }
 #endif

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC vs. Revision 1.188 by root, Thu Dec 20 07:12:57 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC vs.
Revision 1.188 by root, Thu Dec 20 07:12:57 2007 UTC