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

Comparing libev/ev.c (file contents):
Revision 1.293 by root, Mon Jun 29 18:46:52 2009 UTC vs.
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC

 # define inline_speed      static noinline
 #else
 # define inline_speed      static inline
 #endif
-#define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
+#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
+#if EV_MINPRI == EV_MAXPRI
+# define ABSPRI(w) (((W)w), 0)
+#else
-#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
+# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
+#endif
 #define EMPTY       /* required for microsofts broken pseudo-c compiler */
 #define EMPTY2(a,b) /* used to suppress some warnings */
 typedef ev_watcher *W;
 ev_loop_count (EV_P)
 {
   return loop_count;
 }
+unsigned int
+ev_loop_depth (EV_P)
+{
+  return loop_depth;
+}
 void
 ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
 {
   io_blocktime = interval;
 }
       mn_now = ev_rt_now;
     }
 }
-static int loop_done;
 void
 ev_loop (EV_P_ int flags)
 {
+  ++loop_depth;
   loop_done = EVUNLOOP_CANCEL;
   call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
   do
     && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
   ));
   if (loop_done == EVUNLOOP_ONE)
     loop_done = EVUNLOOP_CANCEL;
+  --loop_depth;
 }
 void
 ev_unloop (EV_P_ int how)
 {
 }
 inline_size void
 pri_adjust (EV_P_ W w)
 {
-  int pri = w->priority;
+  int pri = ev_priority (w);
   pri = pri < EV_MINPRI ? EV_MINPRI : pri;
   pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
-  w->priority = pri;
+  ev_set_priority (w, pri);
 }
 inline_speed void
 ev_start (EV_P_ W w, int active)
 {

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