commit 0f827169742aad6209d830db773a101849c32a83
author Elliott Hughes <enh@google.com> Tue Feb 26 12:12:58 2013 -0800
committer Elliott Hughes <enh@google.com> Tue Feb 26 12:12:58 2013 -0800
tree df06bd3d9fa91757d2c87fbe891007184f823e9d
parent eb5cb608fcb0d636961653ad561b2c7ee40de1ad

Fix JDWP ObjectRegistry lock ordering.

Also make debugging lock ordering violations nicer by using our
LockLevel operator<<.

Change-Id: Ic15ebe70363a90a09f6491bd5c336a604e9d6c48

src/jdwp/object_registry.h

diff --git a/src/jdwp/object_registry.h b/src/jdwp/object_registry.h
index 0d39806..e2893ca 100644
--- a/src/jdwp/object_registry.h
+++ b/src/jdwp/object_registry.h
@@ -63,12 +63,12 @@
 
   bool Contains(mirror::Object* o) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  void Clear();
+  void Clear() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  void DisableCollection(JDWP::ObjectId id);
-  void EnableCollection(JDWP::ObjectId id);
+  void DisableCollection(JDWP::ObjectId id) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  void EnableCollection(JDWP::ObjectId id) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  bool IsCollected(JDWP::ObjectId id);
+  bool IsCollected(JDWP::ObjectId id) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   void DisposeObject(JDWP::ObjectId id, uint32_t reference_count)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
@@ -79,8 +79,8 @@
  private:
   JDWP::ObjectId InternalAdd(mirror::Object* o) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   mirror::Object* InternalGet(JDWP::ObjectId id) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-  void Demote(ObjectRegistryEntry& entry);
-  void Promote(ObjectRegistryEntry& entry);
+  void Demote(ObjectRegistryEntry& entry) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, lock_);
+  void Promote(ObjectRegistryEntry& entry) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, lock_);
 
   Mutex lock_ DEFAULT_MUTEX_ACQUIRED_AFTER;