Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 93103 invoked from network); 16 Mar 2009 16:13:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Mar 2009 16:13:14 -0000 Received: (qmail 41152 invoked by uid 500); 16 Mar 2009 16:13:13 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 41101 invoked by uid 500); 16 Mar 2009 16:13:13 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 41092 invoked by uid 99); 16 Mar 2009 16:13:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2009 09:13:13 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2009 16:13:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9B68B23888EB; Mon, 16 Mar 2009 16:12:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r754924 - in /apr/apr/trunk/poll/unix: epoll.c kqueue.c port.c Date: Mon, 16 Mar 2009 16:12:50 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090316161250.9B68B23888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Mon Mar 16 16:12:49 2009 New Revision: 754924 URL: http://svn.apache.org/viewvc?rev=754924&view=rev Log: nelts, the number of elements in the pollset, was neither needed nor properly maintained by these implementations, so axe the related code Modified: apr/apr/trunk/poll/unix/epoll.c apr/apr/trunk/poll/unix/kqueue.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=754924&r1=754923&r2=754924&view=diff ============================================================================== --- apr/apr/trunk/poll/unix/epoll.c (original) +++ apr/apr/trunk/poll/unix/epoll.c Mon Mar 16 16:12:49 2009 @@ -188,7 +188,6 @@ APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem, pfd_elem_t, link); } else { - pollset->nelts++; APR_RING_INSERT_TAIL(&(pollset->p->query_ring), elem, pfd_elem_t, link); } pollset_unlock_rings(); Modified: apr/apr/trunk/poll/unix/kqueue.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/kqueue.c?rev=754924&r1=754923&r2=754924&view=diff ============================================================================== --- apr/apr/trunk/poll/unix/kqueue.c (original) +++ apr/apr/trunk/poll/unix/kqueue.c Mon Mar 16 16:12:49 2009 @@ -177,7 +177,6 @@ } if (rv == APR_SUCCESS) { - pollset->nelts++; APR_RING_INSERT_TAIL(&(pollset->p->query_ring), elem, pfd_elem_t, link); } else { Modified: apr/apr/trunk/poll/unix/port.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/port.c?rev=754924&r1=754923&r2=754924&view=diff ============================================================================== --- apr/apr/trunk/poll/unix/port.c (original) +++ apr/apr/trunk/poll/unix/port.c Mon Mar 16 16:12:49 2009 @@ -185,13 +185,11 @@ APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem, pfd_elem_t, link); } else { - pollset->nelts++; elem->on_query_ring = 1; APR_RING_INSERT_TAIL(&(pollset->p->query_ring), elem, pfd_elem_t, link); } } else { - pollset->nelts++; APR_RING_INSERT_TAIL(&(pollset->p->add_ring), elem, pfd_elem_t, link); }