From 85ae517ebb093d6c3bcc86f87b5a70c720cefd04 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 5 Mar 2014 23:40:59 -0800 Subject: Lock ranking fix for monitor IDs. Free-ing objects holds a lock and so the monitor ID lock needs to be of a lower rank. Change-Id: I594ac04c1f76c5d6fd2e752886040565001d4eaf --- runtime/monitor_pool.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/monitor_pool.cc') diff --git a/runtime/monitor_pool.cc b/runtime/monitor_pool.cc index eadd7a6..19e569d 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) { -- cgit v1.1