You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by tr...@apache.org on 2009/02/21 21:04:04 UTC

svn commit: r746580 - in /apr/apr/trunk/poll/unix: epoll.c port.c

Author: trawick
Date: Sat Feb 21 20:04:03 2009
New Revision: 746580

URL: http://svn.apache.org/viewvc?rev=746580&view=rev
Log:
apr_pollset_create_ex() already made room for the wakeup descriptor,
so the implementation-specific pollset-create can ignore that

Modified:
    apr/apr/trunk/poll/unix/epoll.c
    apr/apr/trunk/poll/unix/port.c

Modified: apr/apr/trunk/poll/unix/epoll.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/epoll.c?rev=746580&r1=746579&r2=746580&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/epoll.c (original)
+++ apr/apr/trunk/poll/unix/epoll.c Sat Feb 21 20:04:03 2009
@@ -95,10 +95,6 @@
     apr_status_t rv;
     int fd;
 
-    if (flags & APR_POLLSET_WAKEABLE) {
-        /* Add room for wakeup descriptor */
-        size++;
-    }
     fd = epoll_create(size);
     if (fd < 0) {
         pollset->p = NULL;

Modified: apr/apr/trunk/poll/unix/port.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/port.c?rev=746580&r1=746579&r2=746580&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/port.c (original)
+++ apr/apr/trunk/poll/unix/port.c Sat Feb 21 20:04:03 2009
@@ -114,10 +114,6 @@
         return APR_ENOTIMPL;
     }
 #endif
-    if (flags & APR_POLLSET_WAKEABLE) {
-        /* Add room for wakeup descriptor */
-        size++;
-    }
     pollset->p->waiting = 0;
 
     pollset->p->port_set = apr_palloc(p, size * sizeof(port_event_t));