commit 5bfa60ffcc953340feb711ed05cf576ac821905e
author Ian Rogers <irogers@google.com> Sun Sep 02 21:17:56 2012 -0700
committer Ian Rogers <irogers@google.com> Sun Sep 02 21:17:56 2012 -0700
tree 6a204b7913b437a8d5a08886e5b7cd34e2864ac7
parent 87e552db94588455c081efd87dbde0cd96d02942

Fix DDMS crash

Check the liveness of an object rather than heap containing to avoid
segv. Move the lock outside the of the visitor to ensure lock level
rules are followed.

Change-Id: I237c7a31a18b783853d1b1956a5c1d1961b2a142

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index c8a2ef7..b3c4844 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -2896,7 +2896,8 @@
   }
 
   static void HeapChunkCallback(void* start, void* end, size_t used_bytes, void* arg)
-      SHARED_LOCKS_REQUIRED(GlobalSynchronization::mutator_lock_) {
+      SHARED_LOCKS_REQUIRED(GlobalSynchronization::heap_bitmap_lock_,
+                            GlobalSynchronization::mutator_lock_) {
     reinterpret_cast<HeapChunkContext*>(arg)->HeapChunkCallback(start, end, used_bytes);
   }
 
@@ -2912,7 +2913,8 @@
   }
 
   void HeapChunkCallback(void* start, void* /*end*/, size_t used_bytes)
-      SHARED_LOCKS_REQUIRED(GlobalSynchronization::mutator_lock_) {
+      SHARED_LOCKS_REQUIRED(GlobalSynchronization::heap_bitmap_lock_,
+                            GlobalSynchronization::mutator_lock_) {
     // Note: heap call backs cannot manipulate the heap upon which they are crawling, care is taken
     // in the following code not to allocate memory, by ensuring buf_ is of the correct size
     if (used_bytes == 0) {
@@ -2994,7 +2996,8 @@
     *p_++ = length - 1;
   }
 
-  uint8_t ExamineObject(const Object* o, bool is_native_heap) {
+  uint8_t ExamineObject(const Object* o, bool is_native_heap)
+      SHARED_LOCKS_REQUIRED(GlobalSynchronization::heap_bitmap_lock_) {
     if (o == NULL) {
       return HPSG_STATE(SOLIDITY_FREE, 0);
     }
@@ -3007,7 +3010,7 @@
       return HPSG_STATE(SOLIDITY_HARD, KIND_NATIVE);
     }
 
-    if (!Runtime::Current()->GetHeap()->IsHeapAddress(o)) {
+    if (!Runtime::Current()->GetHeap()->IsLiveObjectLocked(o)) {
       return HPSG_STATE(SOLIDITY_HARD, KIND_NATIVE);
     }
 
@@ -3087,6 +3090,7 @@
     const SpaceVec& spaces = heap->GetSpaces();
     for (SpaceVec::const_iterator cur = spaces.begin(); cur != spaces.end(); ++cur) {
       if ((*cur)->IsAllocSpace()) {
+        ReaderMutexLock mu(*GlobalSynchronization::heap_bitmap_lock_);
         (*cur)->AsAllocSpace()->Walk(HeapChunkContext::HeapChunkCallback, &context);
       }
     }