Fix at least two deadlocks.
Pretty much every caller that takes the thread list lock can then go on to
cause allocation, which requires the heap lock. The GC always takes the heap
lock first and the thread list lock second (to suspend/resume other threads).
Cue deadlocks.
This patch is a pretty degenerate fix that basically makes the thread list
lock irrelevant; we now always take the heap lock first.
Change-Id: I0537cffb0b841bfb5033789817793734d75dfb31
diff --git a/src/mutex.cc b/src/mutex.cc
index 25d8b76..0dfab11 100644
--- a/src/mutex.cc
+++ b/src/mutex.cc
@@ -27,19 +27,12 @@
namespace art {
Mutex::Mutex(const char* name) : name_(name) {
-#ifndef NDEBUG
- pthread_mutexattr_t debug_attributes;
- CHECK_MUTEX_CALL(pthread_mutexattr_init, (&debug_attributes));
-#if VERIFY_OBJECT_ENABLED
- CHECK_MUTEX_CALL(pthread_mutexattr_settype, (&debug_attributes, PTHREAD_MUTEX_RECURSIVE));
-#else
- CHECK_MUTEX_CALL(pthread_mutexattr_settype, (&debug_attributes, PTHREAD_MUTEX_ERRORCHECK));
-#endif
- CHECK_MUTEX_CALL(pthread_mutex_init, (&mutex_, &debug_attributes));
- CHECK_MUTEX_CALL(pthread_mutexattr_destroy, (&debug_attributes));
-#else
- CHECK_MUTEX_CALL(pthread_mutex_init, (&mutex_, NULL));
-#endif
+ // Like Java, we use recursive mutexes.
+ pthread_mutexattr_t attributes;
+ CHECK_MUTEX_CALL(pthread_mutexattr_init, (&attributes));
+ CHECK_MUTEX_CALL(pthread_mutexattr_settype, (&attributes, PTHREAD_MUTEX_RECURSIVE));
+ CHECK_MUTEX_CALL(pthread_mutex_init, (&mutex_, &attributes));
+ CHECK_MUTEX_CALL(pthread_mutexattr_destroy, (&attributes));
}
Mutex::~Mutex() {