mirrors
/
libev
mirror of /home/gitosis/repositories/libev.git
1
0
Fork 0
Code Releases Activity
Browse Source

µ-opts

master
Marc Alexander Lehmann 14 years ago
parent
3b23689f5e
commit
a4a219b8c4
5 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      ev.c
  2. 4
      ev_epoll.c
  3. 2
      ev_kqueue.c
  4. 8
      ev_poll.c
  5. 8
      ev_select.c

38
ev.c
View File

@ -420,7 +420,7 @@ array_nextsize (int elem, int cur, int cnt)
return ncur;
}
inline_speed void *
static noinline void *
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;
int pri = ABSPRI (w_);
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
@ -751,7 +751,7 @@ sigcb (EV_P_ ev_io *iow, int revents)
ev_feed_signal_event (EV_A_ signum + 1);
}
void inline_size
void inline_speed
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;
@ -1601,7 +1601,7 @@ ev_io_start (EV_P_ ev_io *w)
fd_change (EV_A_ fd);
}
void
void noinline
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);
}
void
void noinline
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));*/
}
void
void noinline
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);
}
void
void noinline
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
void
void noinline
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));*/
}
void
void noinline
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);
}
void
void noinline
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
void
void noinline
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);

4
ev_epoll.c
View File

@ -42,7 +42,7 @@ epoll_modify (EV_P_ int fd, int oev, int nev)
(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);
@ -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.));
if (eventcnt < 0)
if (expect_false (eventcnt < 0))
{
if (errno != EINTR)
syserr ("(libev) epoll_wait");

2
ev_kqueue.c
View File

@ -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;
if (res < 0)
if (expect_false (res < 0))
{
if (errno != EINTR)
syserr ("(libev) kevent");

8
ev_poll.c
View File

@ -31,7 +31,7 @@
#include <poll.h>
static void
void inline_size
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;
if (idx < --pollcnt)
if (expect_true (idx < --pollcnt))
{
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.));
if (res < 0)
if (expect_false (res < 0))
{
if (errno == EBADF)
fd_ebadf (EV_A);
@ -94,7 +94,7 @@ poll_poll (EV_P_ ev_tstamp timeout)
}
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 (

8
ev_select.c
View File

@ -90,7 +90,7 @@ select_modify (EV_P_ int fd, int oev, int nev)
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;
@ -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);
if (res < 0)
if (expect_false (res < 0))
{
#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 (events)
if (expect_true (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;
if (events)
if (expect_true (events))
fd_event (EV_A_ word * NFDBITS + bit, events);
}
}

Write Preview
Loading…
Cancel
Save