diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 07:43:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-06 07:43:22 +0000 |
| commit | 97c3d61e46a3678dac848578c686c724ec3397fa (patch) | |
| tree | 49567501ebde325abf2592459fbd4d5430033bf6 | |
| parent | 653661ff54fd2bd8b66389d8f2cec655723d3547 (diff) | |
| parent | 85ae517ebb093d6c3bcc86f87b5a70c720cefd04 (diff) | |
| download | android_art-97c3d61e46a3678dac848578c686c724ec3397fa.tar.gz android_art-97c3d61e46a3678dac848578c686c724ec3397fa.tar.bz2 android_art-97c3d61e46a3678dac848578c686c724ec3397fa.zip | |
Merge "Lock ranking fix for monitor IDs."
| -rw-r--r-- | runtime/locks.h | 1 | ||||
| -rw-r--r-- | runtime/monitor_pool.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/locks.h b/runtime/locks.h index 2f9810d05b..4343ab40ed 100644 --- a/runtime/locks.h +++ b/runtime/locks.h @@ -46,6 +46,7 @@ enum LockLevel { kMarkSweepMarkStackLock, kTransactionLogLock, kInternTableLock, + kMonitorPoolLock, kDefaultMutexLevel, kMarkSweepLargeObjectLock, kPinTableLock, diff --git a/runtime/monitor_pool.cc b/runtime/monitor_pool.cc index eadd7a6cb1..19e569d204 100644 --- a/runtime/monitor_pool.cc +++ b/runtime/monitor_pool.cc @@ -22,7 +22,8 @@ namespace art { -MonitorPool::MonitorPool() : allocated_ids_lock_("allocated monitor ids lock") { +MonitorPool::MonitorPool() : allocated_ids_lock_("allocated monitor ids lock", + LockLevel::kMonitorPoolLock) { } Monitor* MonitorPool::LookupMonitorFromTable(MonitorId mon_id) { |