add AbbaLockingDetector to test process

h2/src/main/org/h2/util/AbbaLockingDetector.java

@@ -48,6 +48,11 @@ public class AbbaLockingDetector implements Runnable {
         return this;
     }
 
+    public synchronized void reset() {
+        LOCK_ORDERING.clear();
+        KNOWN_DEADLOCKS.clear();
+    }
+    
     /**
      * Stop collecting.
      * 
@@ -127,7 +132,7 @@ public class AbbaLockingDetector implements Runnable {
         }
     }
 
-    private void markHigher(List<String> lockOrder, ThreadInfo threadInfo) {
+    private synchronized void markHigher(List<String> lockOrder, ThreadInfo threadInfo) {
         String topLock = lockOrder.get(lockOrder.size() - 1);
         Map<String, String> map = LOCK_ORDERING.get(topLock);
         if (map == null) {
@@ -232,7 +237,7 @@ public class AbbaLockingDetector implements Runnable {
     }
 
     private static String getObjectName(MonitorInfo info) {
-        return info.getClassName();// + "@" + info.getIdentityHashCode();
+        return info.getClassName() + "@" + Integer.toHexString(info.getIdentityHashCode());
     }
 
 }

h2/src/test/org/h2/test/TestAll.java

@@ -197,6 +197,7 @@ import org.h2.test.utils.OutputCatcher;
 import org.h2.test.utils.SelfDestructor;
 import org.h2.tools.DeleteDbFiles;
 import org.h2.tools.Server;
+import org.h2.util.AbbaLockingDetector;
 import org.h2.util.Profiler;
 import org.h2.util.StringUtils;
 import org.h2.util.Utils;
@@ -363,6 +364,8 @@ java org.h2.test.TestAll timer
 
     private Server server;
 
+    AbbaLockingDetector abbaLockingDetector;
+    
     /**
      * Run all tests.
      *
@@ -509,6 +512,10 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
      */
     private void runTests() throws SQLException {
 
+        if (Boolean.getBoolean("abba")) {
+            abbaLockingDetector = new AbbaLockingDetector().startCollecting();
+        }
+        
         coverage = isCoverage();
 
         smallLog = big = networked = memory = ssl = false;

h2/src/test/org/h2/test/TestBase.java

@@ -138,6 +138,9 @@ public abstract class TestBase {
      * @param conf the test configuration
      */
     public void runTest(TestAll conf) {
+        if (conf.abbaLockingDetector != null) {
+            conf.abbaLockingDetector.reset();
+        }
         try {
             init(conf);
             start = System.currentTimeMillis();