diff options
author | root <root> | 2008-04-16 18:47:06 +0000 |
---|---|---|
committer | root <root> | 2008-04-16 18:47:06 +0000 |
commit | f2b11563b03f2e155a14ba9b2a1f386858a3c57a (patch) | |
tree | 953cd4e04c213dc3e2c95bb2acbd01346d98f41c | |
parent | 49ba445cffec2b673403ad9923aa5d2e1dbaffd3 (diff) |
*** empty log message ***
-rw-r--r-- | Changes | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | ev_poll.c | 32 |
3 files changed, 21 insertions, 17 deletions
@@ -1,5 +1,9 @@ Revision history for libev, a high-performance and full-featured event loop. +3.3 Wed Apr 16 20:45:04 CEST 2008 + - added last minute fix for ev_poll.c by Brandon Black not + included in original 3.3 tarball. + 3.3 Wed Apr 16 19:04:10 CEST 2008 - event_base_loopexit should return 0 on success (W.C.A. Wijngaards). diff --git a/configure.ac b/configure.ac index 4cd8cfa..aad934f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT AC_CONFIG_SRCDIR([ev_epoll.c]) -AM_INIT_AUTOMAKE(libev,3.3) +AM_INIT_AUTOMAKE(libev,3.31) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE @@ -98,22 +98,22 @@ poll_poll (EV_P_ ev_tstamp timeout) else if (errno != EINTR) syserr ("(libev) poll"); } - - for (p = polls; res; ++p) - if (expect_false (p->revents)) /* this expect is debatable */ - { - --res; - - if (expect_false (p->revents & POLLNVAL)) - fd_kill (EV_A_ p->fd); - else - fd_event ( - EV_A_ - p->fd, - (p->revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) - | (p->revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) - ); - } + else + for (p = polls; res; ++p) + if (expect_false (p->revents)) /* this expect is debatable */ + { + --res; + + if (expect_false (p->revents & POLLNVAL)) + fd_kill (EV_A_ p->fd); + else + fd_event ( + EV_A_ + p->fd, + (p->revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) + | (p->revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) + ); + } } int inline_size |