µ-opts

diff --git a/ev.c b/ev.c
index 628ccf9c17fce7d5c3efe9161e94f4aefad756ae..808e07da1ad47115b07aa9dbf556de9755e3e287 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -420,7 +420,7 @@ array_nextsize (int elem, int cur, int cnt)
   return ncur;
 }
 
   return ncur;
 }
 

-inline_speed void *
+static noinline void *

 array_realloc (int elem, void *base, int *cur, int cnt)
 {
   *cur = array_nextsize (elem, *cur, cnt);
 array_realloc (int elem, void *base, int *cur, int cnt)
 {
   *cur = array_nextsize (elem, *cur, cnt);


@@ -455,17 +455,17 @@ void noinline
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;

+  int pri = ABSPRI (w_);

 
   if (expect_false (w_->pending))
 
   if (expect_false (w_->pending))

+    pendings [pri][w_->pending - 1].events |= revents;
+  else

     {
     {

-      pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
-      return;
+      w_->pending = ++pendingcnt [pri];
+      array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
+      pendings [pri][w_->pending - 1].w      = w_;
+      pendings [pri][w_->pending - 1].events = revents;

     }
     }

-
-  w_->pending = ++pendingcnt [ABSPRI (w_)];
-  array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
-  pendings [ABSPRI (w_)][w_->pending - 1].w      = w_;
-  pendings [ABSPRI (w_)][w_->pending - 1].events = revents;

 }
 
 void inline_size
 }
 
 void inline_size


@@ -751,7 +751,7 @@ sigcb (EV_P_ ev_io *iow, int revents)
       ev_feed_signal_event (EV_A_ signum + 1);
 }
 
       ev_feed_signal_event (EV_A_ signum + 1);
 }
 

-void inline_size
+void inline_speed

 fd_intern (int fd)
 {
 #ifdef _WIN32
 fd_intern (int fd)
 {
 #ifdef _WIN32


@@ -1584,7 +1584,7 @@ ev_stop (EV_P_ W w)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-void
+void noinline

 ev_io_start (EV_P_ ev_io *w)
 {
   int fd = w->fd;
 ev_io_start (EV_P_ ev_io *w)
 {
   int fd = w->fd;


@@ -1601,7 +1601,7 @@ ev_io_start (EV_P_ ev_io *w)
   fd_change (EV_A_ fd);
 }
 
   fd_change (EV_A_ fd);
 }
 

-void
+void noinline

 ev_io_stop (EV_P_ ev_io *w)
 {
   clear_pending (EV_A_ (W)w);
 ev_io_stop (EV_P_ ev_io *w)
 {
   clear_pending (EV_A_ (W)w);


@@ -1616,7 +1616,7 @@ ev_io_stop (EV_P_ ev_io *w)
   fd_change (EV_A_ w->fd);
 }
 
   fd_change (EV_A_ w->fd);
 }
 

-void
+void noinline

 ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))
 ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))


@@ -1634,7 +1634,7 @@ ev_timer_start (EV_P_ ev_timer *w)
   /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
 }
 
   /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
 }
 

-void
+void noinline

 ev_timer_stop (EV_P_ ev_timer *w)
 {
   clear_pending (EV_A_ (W)w);
 ev_timer_stop (EV_P_ ev_timer *w)
 {
   clear_pending (EV_A_ (W)w);


@@ -1658,7 +1658,7 @@ ev_timer_stop (EV_P_ ev_timer *w)
   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 

-void
+void noinline

 ev_timer_again (EV_P_ ev_timer *w)
 {
   if (ev_is_active (w))
 ev_timer_again (EV_P_ ev_timer *w)
 {
   if (ev_is_active (w))


@@ -1679,7 +1679,7 @@ ev_timer_again (EV_P_ ev_timer *w)
 }
 
 #if EV_PERIODIC_ENABLE
 }
 
 #if EV_PERIODIC_ENABLE

-void
+void noinline

 ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))
 ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))


@@ -1702,7 +1702,7 @@ ev_periodic_start (EV_P_ ev_periodic *w)
   /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
 }
 
   /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
 }
 

-void
+void noinline

 ev_periodic_stop (EV_P_ ev_periodic *w)
 {
   clear_pending (EV_A_ (W)w);
 ev_periodic_stop (EV_P_ ev_periodic *w)
 {
   clear_pending (EV_A_ (W)w);


@@ -1724,7 +1724,7 @@ ev_periodic_stop (EV_P_ ev_periodic *w)
   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 

-void
+void noinline

 ev_periodic_again (EV_P_ ev_periodic *w)
 {
   /* TODO: use adjustheap and recalculation */
 ev_periodic_again (EV_P_ ev_periodic *w)
 {
   /* TODO: use adjustheap and recalculation */


@@ -1737,7 +1737,7 @@ ev_periodic_again (EV_P_ ev_periodic *w)
 # define SA_RESTART 0
 #endif
 
 # define SA_RESTART 0
 #endif
 

-void
+void noinline

 ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY
 ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY


@@ -1766,7 +1766,7 @@ ev_signal_start (EV_P_ ev_signal *w)
     }
 }
 
     }
 }
 

-void
+void noinline

 ev_signal_stop (EV_P_ ev_signal *w)
 {
   clear_pending (EV_A_ (W)w);
 ev_signal_stop (EV_P_ ev_signal *w)
 {
   clear_pending (EV_A_ (W)w);

diff --git a/ev_epoll.c b/ev_epoll.c
index 38fd3040c35418d9495233c659e951fe4d59092c..c544a140c3b45730e6d8f5f97b9cfef8556bc4b0 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -42,7 +42,7 @@ epoll_modify (EV_P_ int fd, int oev, int nev)
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 

-  if (epoll_ctl (backend_fd, mode, fd, &ev))
+  if (expect_false (epoll_ctl (backend_fd, mode, fd, &ev)))

     if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */
         || (nev && epoll_ctl (backend_fd, EPOLL_CTL_ADD, fd, &ev)))
       fd_kill (EV_A_ fd);
     if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */
         || (nev && epoll_ctl (backend_fd, EPOLL_CTL_ADD, fd, &ev)))
       fd_kill (EV_A_ fd);


@@ -54,7 +54,7 @@ epoll_poll (EV_P_ ev_tstamp timeout)
   int i;
   int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
 
   int i;
   int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
 

-  if (eventcnt < 0)
+  if (expect_false (eventcnt < 0))

     {
       if (errno != EINTR)
         syserr ("(libev) epoll_wait");
     {
       if (errno != EINTR)
         syserr ("(libev) epoll_wait");

diff --git a/ev_kqueue.c b/ev_kqueue.c
index 4fd649fbdb7cd0937e37a0ed9760bedbaece212a..3103db1dd711a3867311366430b5a839ca9e1d45 100644 (file)
--- a/ev_kqueue.c
+++ b/ev_kqueue.c
@@ -92,7 +92,7 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
   kqueue_changecnt = 0;
 
   res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
   kqueue_changecnt = 0;
 

-  if (res < 0)
+  if (expect_false (res < 0))

     { 
       if (errno != EINTR)
         syserr ("(libev) kevent");
     { 
       if (errno != EINTR)
         syserr ("(libev) kevent");

diff --git a/ev_poll.c b/ev_poll.c
index 52fe42d129620fd099f772d3fd9160dbdfdc8bdd..9ceff1659c60ac3207d301f8fc14e7ab2c33282d 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -31,7 +31,7 @@
 
 #include <poll.h>
 
 
 #include <poll.h>
 

-static void
+void inline_size

 pollidx_init (int *base, int count)
 {
   while (count--)
 pollidx_init (int *base, int count)
 {
   while (count--)


@@ -67,7 +67,7 @@ poll_modify (EV_P_ int fd, int oev, int nev)
     {
       pollidxs [fd] = -1;
 
     {
       pollidxs [fd] = -1;
 

-      if (idx < --pollcnt)
+      if (expect_true (idx < --pollcnt))

         {
           polls [idx] = polls [pollcnt];
           pollidxs [polls [idx].fd] = idx;
         {
           polls [idx] = polls [pollcnt];
           pollidxs [polls [idx].fd] = idx;


@@ -81,7 +81,7 @@ poll_poll (EV_P_ ev_tstamp timeout)
   int i;
   int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
 
   int i;
   int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
 

-  if (res < 0)
+  if (expect_false (res < 0))

     {
       if (errno == EBADF)
         fd_ebadf (EV_A);
     {
       if (errno == EBADF)
         fd_ebadf (EV_A);


@@ -94,7 +94,7 @@ poll_poll (EV_P_ ev_tstamp timeout)
     }
 
   for (i = 0; i < pollcnt; ++i)
     }
 
   for (i = 0; i < pollcnt; ++i)

-    if (polls [i].revents & POLLNVAL)
+    if (expect_false (polls [i].revents & POLLNVAL))

       fd_kill (EV_A_ polls [i].fd);
     else
       fd_event (
       fd_kill (EV_A_ polls [i].fd);
     else
       fd_event (

diff --git a/ev_select.c b/ev_select.c
index 1df0953b3a265a4f705b3a5314fd98b71bddfdd7..f899a794ad44ce56c8ad4c3af02c6bf2592ec4dd 100644 (file)
--- a/ev_select.c
+++ b/ev_select.c
@@ -90,7 +90,7 @@ select_modify (EV_P_ int fd, int oev, int nev)
     int word = fd / NFDBITS;
     int mask = 1UL << (fd % NFDBITS);
 
     int word = fd / NFDBITS;
     int mask = 1UL << (fd % NFDBITS);
 

-    if (vec_max < word + 1)
+    if (expect_false (vec_max < word + 1))

       {
         int new_max = word + 1;
 
       {
         int new_max = word + 1;
 


@@ -134,7 +134,7 @@ select_poll (EV_P_ ev_tstamp timeout)
 
   res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 
 
   res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 

-  if (res < 0)
+  if (expect_false (res < 0))

     {
       #if EV_SELECT_IS_WINSOCKET
       errno = WSAGetLastError ();
     {
       #if EV_SELECT_IS_WINSOCKET
       errno = WSAGetLastError ();


@@ -168,7 +168,7 @@ select_poll (EV_P_ ev_tstamp timeout)
           if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
           if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
 
           if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
           if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
 

-          if (events)
+          if (expect_true (events))

             fd_event (EV_A_ fd, events);
         }
   }
             fd_event (EV_A_ fd, events);
         }
   }


@@ -191,7 +191,7 @@ select_poll (EV_P_ ev_tstamp timeout)
               events |= word_r & mask ? EV_READ  : 0;
               events |= word_w & mask ? EV_WRITE : 0;
 
               events |= word_r & mask ? EV_READ  : 0;
               events |= word_w & mask ? EV_WRITE : 0;
 

-              if (events)
+              if (expect_true (events))

                 fd_event (EV_A_ word * NFDBITS + bit, events);
             }
       }
                 fd_event (EV_A_ word * NFDBITS + bit, events);
             }
       }