svn commit: r517680 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java

[ka...@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 @@
 	 * <BR>
 	 * MT - must be synchronized on the <code>LockSet</code> 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];