apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r748684 - /apr/apr/trunk/poll/unix/epoll.c
Date Fri, 27 Feb 2009 20:29:11 GMT
Author: trawick
Date: Fri Feb 27 20:29:11 2009
New Revision: 748684

URL: http://svn.apache.org/viewvc?rev=748684&view=rev
Log:
no need to copy descriptors if only the wakeup pipe popped

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

Modified: apr/apr/trunk/poll/unix/epoll.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/epoll.c?rev=748684&r1=748683&r2=748684&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/epoll.c (original)
+++ apr/apr/trunk/poll/unix/epoll.c Fri Feb 27 20:29:11 2009
@@ -292,18 +292,19 @@
                 j++;
             }
         }
-        if (((*num) = j))
+        if (((*num) = j)) { /* any event besides wakeup pipe? */
             rv = APR_SUCCESS;
 
-        if (descriptors) {
-            *descriptors = pollset->p->result_set;
+            if (descriptors) {
+                *descriptors = pollset->p->result_set;
+            }
         }
     }
 
     if (!(pollset->flags & APR_POLLSET_NOCOPY)) {
         pollset_lock_rings();
 
-        /* Shift all PFDs in the Dead Ring to be Free Ring */
+        /* Shift all PFDs in the Dead Ring to the Free Ring */
         APR_RING_CONCAT(&(pollset->p->free_ring), &(pollset->p->dead_ring),
pfd_elem_t, link);
 
         pollset_unlock_rings();



Mime
View raw message