commit 3e392681fd57eaa64d4a65bd99d3576b8366569d
author Bill Buzbee <buzbee@google.com> Wed Feb 03 18:13:57 2010 -0800
committer Bill Buzbee <buzbee@google.com> Wed Feb 03 18:13:57 2010 -0800
tree d6b3618b928528781999d40b8cd587654326349c
parent 6d470592dcd18ce22fc13857d38348bc5817a29f

Jit: Fix deadlock in method tracing.

vm/compiler/Compiler.c

diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index adcc16e..c16e78c 100644
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -520,6 +520,7 @@
 {
     bool jitActive;
     bool jitActivate;
+    bool needUnchain = false;
 
     dvmLockMutex(&gDvmJit.tableLock);
     jitActive = gDvmJit.pProfTable != NULL;
@@ -527,10 +528,11 @@
 
     if (jitActivate && !jitActive) {
         gDvmJit.pProfTable = gDvmJit.pProfTableCopy;
-        dvmUnlockMutex(&gDvmJit.tableLock);
     } else if (!jitActivate && jitActive) {
         gDvmJit.pProfTable = NULL;
-        dvmUnlockMutex(&gDvmJit.tableLock);
-        dvmJitUnchainAll();
+        needUnchain = true;
     }
+    dvmUnlockMutex(&gDvmJit.tableLock);
+    if (needUnchain)
+        dvmJitUnchainAll();
 }