Shutdown the compiler thread before the dvmSlayDaemons call is made.

1 files changed, 6 insertions, 1 deletions

diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index 0b5c2116c..9473834a5 100644
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -144,6 +144,8 @@ static void *compilerThreadStart(void *arg)
     }
     pthread_cond_signal(&gDvmJit.compilerQueueEmpty);
     dvmUnlockMutex(&gDvmJit.compilerLock);
+
+    LOGD("Compiler thread shutting down\n");
     return NULL;
 }
 
@@ -242,6 +244,9 @@ void dvmCompilerShutdown(void)
         pthread_cond_signal(&gDvmJit.compilerQueueActivity);
         dvmUnlockMutex(&gDvmJit.compilerLock);
 
-        pthread_join(gDvmJit.compilerHandle, &threadReturn);
+        if (pthread_join(gDvmJit.compilerHandle, &threadReturn) != 0)
+            LOGW("Compiler thread join failed\n");
+        else
+            LOGD("Compiler thread has shut down\n");
     }
 }