commit 2994605707219f67af8340ddd9379ce9bd86d74c
author Mathieu Chartier <mathieuc@google.com> Mon Dec 21 13:02:14 2015 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Dec 21 13:35:59 2015 -0800
tree ce7ffb41e639a8b1cc313d74d5dc47e1de6e91f2
parent 76b90e37dfe6eecc904017be8046dd208d30ab8b

Fix lock ordering violation

Move ros alloc lock ordering above transaction lock level.

Bug: 26292262

Change-Id: I55f75bd86b413ce193d4df890a39a9c459bc2034

runtime/base/mutex.h

diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index d4c9057..263f50d 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -63,6 +63,9 @@
   kLambdaTableLock,
   kJdwpSocketLock,
   kRegionSpaceRegionLock,
+  kRosAllocGlobalLock,
+  kRosAllocBracketLock,
+  kRosAllocBulkFreeLock,
   kTransactionLogLock,
   kMarkSweepMarkStackLock,
   kJniWeakGlobalsLock,
@@ -73,9 +76,6 @@
   kReferenceQueueClearedReferencesLock,
   kReferenceProcessorLock,
   kJitCodeCacheLock,
-  kRosAllocGlobalLock,
-  kRosAllocBracketLock,
-  kRosAllocBulkFreeLock,
   kAllocSpaceLock,
   kBumpPointerSpaceBlockLock,
   kArenaPoolLock,