From commits-return-7258-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Jan 22 02:45:44 2006 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 19280 invoked from network); 22 Jan 2006 02:45:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Jan 2006 02:45:44 -0000 Received: (qmail 98477 invoked by uid 500); 22 Jan 2006 02:45:43 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 98439 invoked by uid 500); 22 Jan 2006 02:45:42 -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 98421 invoked by uid 99); 22 Jan 2006 02:45:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jan 2006 18:45:42 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 21 Jan 2006 18:45:41 -0800 Received: (qmail 19165 invoked by uid 65534); 22 Jan 2006 02:45:21 -0000 Message-ID: <20060122024521.19163.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r371172 - in /apr/apr/trunk: CHANGES locks/win32/thread_rwlock.c test/testlock.c Date: Sun, 22 Jan 2006 02:45:20 -0000 To: commits@apr.apache.org From: rooneg@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rooneg Date: Sat Jan 21 18:45:18 2006 New Revision: 371172 URL: http://svn.apache.org/viewcvs?rev=371172&view=rev Log: Fix an assert that occurs when you destroy a rwlock on win32 and later clear the pool it was allocated from. Submitted by: Evgueni Brevnov * locks/win32/thread_rwlock.c (apr_thread_rwlock_destroy): Use apr_pool_cleanup_run to call our cleanup function. (thread_rwlock_cleanup): Put the destruction of the rwlock here instead of in the destructor function. * test/testlock.c (test_thread_rwlocks): Destroy the rwlock explicitly so we can see this kind of problem. * CHANGES: Note change. Modified: apr/apr/trunk/CHANGES apr/apr/trunk/locks/win32/thread_rwlock.c apr/apr/trunk/test/testlock.c Modified: apr/apr/trunk/CHANGES URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?rev=371172&r1=371171&r2=371172&view=diff ============================================================================== --- apr/apr/trunk/CHANGES (original) +++ apr/apr/trunk/CHANGES Sat Jan 21 18:45:18 2006 @@ -1,5 +1,8 @@ Changes for APR 1.3.0 + *) Fix assertion from double close of a handle with a rwlock on win32. + [Evgueni Brevnov ] + *) APR_FIND_APR macro now supports customisable detailed checks on each installed apr. [Justin Erenkrantz, Colm MacCarthaigh] Modified: apr/apr/trunk/locks/win32/thread_rwlock.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/locks/win32/thread_rwlock.c?rev=371172&r1=371171&r2=371172&view=diff ============================================================================== --- apr/apr/trunk/locks/win32/thread_rwlock.c (original) +++ apr/apr/trunk/locks/win32/thread_rwlock.c Sat Jan 21 18:45:18 2006 @@ -23,7 +23,15 @@ static apr_status_t thread_rwlock_cleanup(void *data) { - return apr_thread_rwlock_destroy((apr_thread_rwlock_t *) data); + apr_thread_rwlock_t *rwlock = data; + + if (! CloseHandle(rwlock->read_event)) + return apr_get_os_error(); + + if (! CloseHandle(rwlock->write_mutex)) + return apr_get_os_error(); + + return APR_SUCCESS; } APR_DECLARE(apr_status_t)apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock, @@ -151,13 +159,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock) { - if (! CloseHandle(rwlock->read_event)) - return apr_get_os_error(); - - if (! CloseHandle(rwlock->write_mutex)) - return apr_get_os_error(); - - return APR_SUCCESS; + return apr_pool_cleanup_run(rwlock->pool, rwlock, thread_rwlock_cleanup); } APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock) Modified: apr/apr/trunk/test/testlock.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/test/testlock.c?rev=371172&r1=371171&r2=371172&view=diff ============================================================================== --- apr/apr/trunk/test/testlock.c (original) +++ apr/apr/trunk/test/testlock.c Sat Jan 21 18:45:18 2006 @@ -209,6 +209,8 @@ apr_thread_join(&s4, t4); ABTS_INT_EQUAL(tc, MAX_ITER, x); + + apr_thread_rwlock_destroy(rwlock); } static void test_cond(abts_case *tc, void *data)