feat: support deadlock detection on android (#250)

dashpay · Apr 8, 2024 · d161488 · d161488
1 parent f62029d
commit d161488
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/bitcoinj/evolution/QuorumState.java b/core/src/main/java/org/bitcoinj/evolution/QuorumState.java
@@ -267,6 +267,7 @@ public void processDiff(@Nullable Peer peer, SimplifiedMasternodeListDiff mnlist
 
         lock.lock();
         try {
+            log.info("lock acquired when processing mnlistdiff");
             applyDiff(peer, blockChain, mnlistdiff, isLoadingBootStrap);
 
             log.info(this.toString());

diff --git a/core/src/main/java/org/bitcoinj/utils/Threading.java b/core/src/main/java/org/bitcoinj/utils/Threading.java
@@ -149,14 +149,19 @@ public void execute(@Nonnull Runnable runnable) {
 
     private static CycleDetectingLockFactory.Policy policy;
     public static CycleDetectingLockFactory factory;
+    private static boolean useDefaultAndroidPolicy = true;
 
     public static ReentrantLock lock(String name) {
-        if (Utils.isAndroidRuntime())
+        if (Utils.isAndroidRuntime() && useDefaultAndroidPolicy)
             return new ReentrantLock(true);
         else
             return factory.newReentrantLock(name);
     }
 
+    public static void setUseDefaultAndroidPolicy(boolean use) {
+        useDefaultAndroidPolicy = use;
+    }
+
     public static void warnOnLockCycles() {
         setPolicy(CycleDetectingLockFactory.Policies.WARN);
     }