From commits-return-11470-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri Sep 24 17:33:12 2010 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 53623 invoked from network); 24 Sep 2010 17:33:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Sep 2010 17:33:12 -0000 Received: (qmail 72088 invoked by uid 500); 24 Sep 2010 17:33:12 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 71977 invoked by uid 500); 24 Sep 2010 17:33:11 -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 71970 invoked by uid 99); 24 Sep 2010 17:33:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Sep 2010 17:33:11 +0000 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; Fri, 24 Sep 2010 17:33:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4604123889C5; Fri, 24 Sep 2010 17:32:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1000990 - /apr/apr-util/branches/1.5.x/include/apr_reslist.h Date: Fri, 24 Sep 2010 17:32:48 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100924173248.4604123889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Fri Sep 24 17:32:47 2010 New Revision: 1000990 URL: http://svn.apache.org/viewvc?rev=1000990&view=rev Log: merge apr trunk r1000850 update apr_reslist_create() doc to reflect that ttl is honored absolutely and smax has a more subtle role Reviewed by: rpleum Modified: apr/apr-util/branches/1.5.x/include/apr_reslist.h Modified: apr/apr-util/branches/1.5.x/include/apr_reslist.h URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apr_reslist.h?rev=1000990&r1=1000989&r2=1000990&view=diff ============================================================================== --- apr/apr-util/branches/1.5.x/include/apr_reslist.h (original) +++ apr/apr-util/branches/1.5.x/include/apr_reslist.h Fri Sep 24 17:32:47 2010 @@ -69,11 +69,13 @@ typedef apr_status_t (*apr_reslist_destr * list will be stored. * @param min Allowed minimum number of available resources. Zero * creates new resources only when needed. - * @param smax Resources will be destroyed to meet this maximum - * restriction as they expire. + * @param smax Resources will be destroyed during reslist maintenance to + * meet this maximum restriction as they expire (reach their ttl). * @param hmax Absolute maximum limit on the number of total resources. - * @param ttl If non-zero, sets the maximum amount of time in microseconds a - * resource may be available while exceeding the soft limit. + * @param ttl If non-zero, sets the maximum amount of time in microseconds an + * unused resource is valid. Any resource which has exceeded this + * time will be destroyed, either when encountered by + * apr_reslist_acquire() or during reslist maintenance. * @param con Constructor routine that is called to create a new resource. * @param de Destructor routine that is called to destroy an expired resource. * @param params Passed to constructor and deconstructor