From f2b11563b03f2e155a14ba9b2a1f386858a3c57a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 16 Apr 2008 18:47:06 +0000 Subject: *** empty log message *** --- Changes | 4 ++++ configure.ac | 2 +- ev_poll.c | 32 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Changes b/Changes index 2cad050..3e49bcb 100644 --- a/Changes +++ b/Changes @@ -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 diff --git a/ev_poll.c b/ev_poll.c index 48d8593..51d3e5e 100644 --- a/ev_poll.c +++ b/ev_poll.c @@ -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 -- cgit v1.2.3