OSDN Git Service

Fix lock ordering violation
authorMathieu Chartier <mathieuc@google.com>
Mon, 21 Dec 2015 21:02:14 +0000 (13:02 -0800)
committerMathieu Chartier <mathieuc@google.com>
Mon, 21 Dec 2015 21:35:59 +0000 (13:35 -0800)
Move ros alloc lock ordering above transaction lock level.

Bug: 26292262

Change-Id: I55f75bd86b413ce193d4df890a39a9c459bc2034

runtime/base/mutex.h

index d4c9057..263f50d 100644 (file)
@@ -63,6 +63,9 @@ enum LockLevel {
   kLambdaTableLock,
   kJdwpSocketLock,
   kRegionSpaceRegionLock,
+  kRosAllocGlobalLock,
+  kRosAllocBracketLock,
+  kRosAllocBulkFreeLock,
   kTransactionLogLock,
   kMarkSweepMarkStackLock,
   kJniWeakGlobalsLock,
@@ -73,9 +76,6 @@ enum LockLevel {
   kReferenceQueueClearedReferencesLock,
   kReferenceProcessorLock,
   kJitCodeCacheLock,
-  kRosAllocGlobalLock,
-  kRosAllocBracketLock,
-  kRosAllocBulkFreeLock,
   kAllocSpaceLock,
   kBumpPointerSpaceBlockLock,
   kArenaPoolLock,