Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 74456 invoked from network); 13 Mar 2007 13:14:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2007 13:14:39 -0000 Received: (qmail 208 invoked by uid 500); 13 Mar 2007 13:14:48 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 143 invoked by uid 500); 13 Mar 2007 13:14:47 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 128 invoked by uid 99); 13 Mar 2007 13:14:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 06:14:47 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 06:14:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4D5B21A9838; Tue, 13 Mar 2007 06:14:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517680 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java Date: Tue, 13 Mar 2007 13:14:18 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070313131418.4D5B21A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Tue Mar 13 06:14:17 2007 New Revision: 517680 URL: http://svn.apache.org/viewvc?view=rev&rev=517680 Log: DERBY-2327 (partial) Reduce monitor contention in LockSet Make the deadlock detection code work on AbstractPool instead of SinglePool. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java?view=diff&rev=517680&r1=517679&r2=517680 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java Tue Mar 13 06:14:17 2007 @@ -50,7 +50,7 @@ *
* MT - must be synchronized on the LockSet object. */ - static Object[] look(SinglePool factory, LockTable set, + static Object[] look(AbstractPool factory, LockTable set, LockControl control, ActiveLock startingLock, byte deadlockWake) { @@ -188,7 +188,8 @@ return waiters; } - private static Object[] handle(SinglePool factory, Stack chain, int start, Dictionary waiters, byte deadlockWake) { + private static Object[] handle(AbstractPool factory, Stack chain, int start, + Dictionary waiters, byte deadlockWake) { // If start is zero then the space that started looking for the // deadlock is activly involved in the deadlock. @@ -235,7 +236,8 @@ } - static StandardException buildException(SinglePool factory, Object[] data) { + static StandardException buildException(AbstractPool factory, + Object[] data) { Stack chain = (Stack) data[0]; Dictionary waiters = (Dictionary) data[1];