diff options
| author | 2014-07-10 07:54:06 +0000 | |
|---|---|---|
| committer | 2014-07-09 14:45:53 +0000 | |
| commit | c4f72ec44660f804b595bfaf2b959f46fd2ff00d (patch) | |
| tree | df8764e4ec382b4e4810b8d0309823a40ef47d5c /runtime/base/mutex.h | |
| parent | af4cf5d72a2bf77f0e442bedb208f9227f262c89 (diff) | |
| parent | 74240819ae09e29b2753ef38f4eb4be1c2762e2e (diff) | |
Merge "Use memory chunks for monitors on LP64"
Diffstat (limited to 'runtime/base/mutex.h')
| -rw-r--r-- | runtime/base/mutex.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index 9dc7deab84..8d2cd07aea 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -70,7 +70,6 @@ enum LockLevel { kMarkSweepMarkStackLock, kTransactionLogLock, kInternTableLock, - kMonitorPoolLock, kDefaultMutexLevel, kMarkSweepLargeObjectLock, kPinTableLock, @@ -78,6 +77,7 @@ enum LockLevel { kJdwpObjectRegistryLock, kModifyLdtLock, kAllocatedThreadIdsLock, + kMonitorPoolLock, kClassLinkerClassesLock, kBreakpointLock, kMonitorLock, @@ -560,8 +560,10 @@ class Locks { // doesn't try to hold a higher level Mutex. #define DEFAULT_MUTEX_ACQUIRED_AFTER ACQUIRED_AFTER(Locks::classlinker_classes_lock_) + static Mutex* allocated_monitor_ids_lock_ ACQUIRED_AFTER(classlinker_classes_lock_); + // Guard the allocation/deallocation of thread ids. - static Mutex* allocated_thread_ids_lock_ ACQUIRED_AFTER(classlinker_classes_lock_); + static Mutex* allocated_thread_ids_lock_ ACQUIRED_AFTER(allocated_monitor_ids_lock_); // Guards modification of the LDT on x86. static Mutex* modify_ldt_lock_ ACQUIRED_AFTER(allocated_thread_ids_lock_); |