commit a1c1c71e24c93a720bbf13de129c75a9a0bde37a
author Mathieu Chartier <mathieuc@google.com> Mon Jun 23 17:53:09 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jun 23 17:55:22 2014 -0700
tree 7c86b8684123587894997077680fdc7324954f9c
parent 9462a31caedefac3e04bd4aa5088e050ed188b30

Use reader lock of bulk free lock when not freeing.

Should help reduce contention observed in systrace.

Change-Id: Iadb81728d4ba797c3a68acea795b15d7f212e89b

runtime/gc/allocator/rosalloc.h

diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h
index a439188..13f61ec 100644
--- a/runtime/gc/allocator/rosalloc.h
+++ b/runtime/gc/allocator/rosalloc.h
@@ -45,10 +45,7 @@
     byte magic_num_;  // The magic number used for debugging only.
 
     bool IsFree() const {
-      if (kIsDebugBuild) {
-        return magic_num_ == kMagicNumFree;
-      }
-      return true;
+      return !kIsDebugBuild || magic_num_ == kMagicNumFree;
     }
     size_t ByteSize(RosAlloc* rosalloc) const EXCLUSIVE_LOCKS_REQUIRED(rosalloc->lock_) {
       const byte* fpr_base = reinterpret_cast<const byte*>(this);