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

Comparing libev/ev.c (file contents):
Revision 1.122 by root, Sat Nov 17 02:00:48 2007 UTC vs.
Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC

 # include "ev.h"
 #endif
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
-# define inline                     inline
+# define inline                     static inline
 #else
 # define expect(expr,value)         (expr)
 # define inline                     static
 #endif
 void
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
-  if (w_->pending)
+  if (expect_false (w_->pending))
     {
       pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
       return;
     }
   fd_event (EV_A_ fd, revents);
 }
 /*****************************************************************************/
-static void
+inline void
 fd_reify (EV_P)
 {
   int i;
   for (i = 0; i < fdchangecnt; ++i)
 }
 static void
 fd_change (EV_P_ int fd)
 {
-  if (anfds [fd].reify)
+  if (expect_false (anfds [fd].reify))
     return;
   anfds [fd].reify = 1;
   ++fdchangecnt;
       ev_io_stop (EV_A_ w);
       ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
     }
 }
-static int
+inline int
 fd_valid (int fd)
 {
 #ifdef _WIN32
   return _get_osfhandle (fd) != -1;
 #else
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)
       ev_feed_signal_event (EV_A_ signum + 1);
 }
-inline void
+static void
 fd_intern (int fd)
 {
 #ifdef _WIN32
   int arg = 1;
   ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
             EV_CB_INVOKE (p->w, p->events);
           }
       }
 }
-static void
+inline void
 timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
     {
       struct ev_timer *w = timers [0];
       ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
     }
 }
 #if EV_PERIODICS
-static void
+inline void
 periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
     {
       struct ev_periodic *w = periodics [0];
       ev_rt_now = ev_time ();
       return 1;
     }
 }
-static void
+inline void
 time_update (EV_P)
 {
   int i;
 #if EV_USE_MONOTONIC
               ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
               if (block > to) block = to;
             }
 #endif
-          if (block < 0.) block = 0.;
+          if (expect_false (block < 0.)) block = 0.;
         }
       method_poll (EV_A_ block);
       /* update ev_rt_now, do magic */
       /* queue idle watchers unless io or timers are pending */
       if (idlecnt && !any_pending (EV_A))
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
       /* queue check watchers, to be executed first */
-      if (checkcnt)
+      if (expect_false (checkcnt))
         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
       call_pending (EV_A);
-      if (loop_done)
+      if (expect_false (loop_done))
         break;
     }
   if (loop_done != 2)
     loop_done = 0;
 void
 ev_io_start (EV_P_ struct ev_io *w)
 {
   int fd = w->fd;
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   assert (("ev_io_start called with negative fd", fd >= 0));
   ev_start (EV_A_ (W)w, 1);
 void
 ev_io_stop (EV_P_ struct ev_io *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
 }
 void
 ev_timer_start (EV_P_ struct ev_timer *w)
 {
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   ((WT)w)->at += mn_now;
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 void
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
-  if (((W)w)->active < timercnt--)
+  if (expect_true (((W)w)->active < timercnt--))
     {
       timers [((W)w)->active - 1] = timers [timercnt];
       adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
     }
 #if EV_PERIODICS
 void
 ev_periodic_start (EV_P_ struct ev_periodic *w)
 {
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   if (w->reschedule_cb)
     ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
   else if (w->interval)
 void
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
-  if (((W)w)->active < periodiccnt--)
+  if (expect_true (((W)w)->active < periodiccnt--))
     {
       periodics [((W)w)->active - 1] = periodics [periodiccnt];
       adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
     }
 #endif
 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   ev_start (EV_A_ (W)w, ++idlecnt);
   array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
   idles [idlecnt - 1] = w;
 void
 ev_idle_stop (EV_P_ struct ev_idle *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   idles [((W)w)->active - 1] = idles [--idlecnt];
   ev_stop (EV_A_ (W)w);
 }
 void
 ev_prepare_start (EV_P_ struct ev_prepare *w)
 {
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   ev_start (EV_A_ (W)w, ++preparecnt);
   array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
   prepares [preparecnt - 1] = w;
 void
 ev_prepare_stop (EV_P_ struct ev_prepare *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   prepares [((W)w)->active - 1] = prepares [--preparecnt];
   ev_stop (EV_A_ (W)w);
 }
 void
 ev_check_start (EV_P_ struct ev_check *w)
 {
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   ev_start (EV_A_ (W)w, ++checkcnt);
   array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
   checks [checkcnt - 1] = w;
 void
 ev_check_stop (EV_P_ struct ev_check *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   checks [((W)w)->active - 1] = checks [--checkcnt];
   ev_stop (EV_A_ (W)w);
 }
 ev_signal_start (EV_P_ struct ev_signal *w)
 {
 #if EV_MULTIPLICITY
   assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
   ev_start (EV_A_ (W)w, 1);
 void
 ev_signal_stop (EV_P_ struct ev_signal *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
   ev_stop (EV_A_ (W)w);
 ev_child_start (EV_P_ struct ev_child *w)
 {
 #if EV_MULTIPLICITY
   assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))
     return;
   ev_start (EV_A_ (W)w, 1);
   wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
 }
 void
 ev_child_stop (EV_P_ struct ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))
     return;
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
   ev_stop (EV_A_ (W)w);
 }
 void
 ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
 {
   struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
-  if (!once)
+  if (expect_false (!once))
+    {
-    cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+      cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
-  else
+      return;
-    {
+    }
-      once->cb  = cb;
+  once->cb  = cb;
-      once->arg = arg;
+  once->arg = arg;
-      ev_init (&once->io, once_cb_io);
+  ev_init (&once->io, once_cb_io);
-      if (fd >= 0)
+  if (fd >= 0)
-        {
+    {
-          ev_io_set (&once->io, fd, events);
+      ev_io_set (&once->io, fd, events);
-          ev_io_start (EV_A_ &once->io);
+      ev_io_start (EV_A_ &once->io);
-        }
+    }
-      ev_init (&once->to, once_cb_to);
+  ev_init (&once->to, once_cb_to);
-      if (timeout >= 0.)
+  if (timeout >= 0.)
-        {
+    {
-          ev_timer_set (&once->to, timeout, 0.);
+      ev_timer_set (&once->to, timeout, 0.);
-          ev_timer_start (EV_A_ &once->to);
+      ev_timer_start (EV_A_ &once->to);
-        }
     }
 }
 #ifdef __cplusplus
 }

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.122 by root, Sat Nov 17 02:00:48 2007 UTC vs. Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.122 by root, Sat Nov 17 02:00:48 2007 UTC vs.
Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC