commit 734b8c62cc637c25f4c2481ca6a48adbd7209c6c
author Elliott Hughes <enh@google.com> Fri Jan 11 15:32:45 2013 -0800
committer Elliott Hughes <enh@google.com> Fri Jan 11 15:32:45 2013 -0800
tree 1e3176c62b1155f58b157dd965d8b64e26ccaaf2
parent d2ece2e84931dbfaddb1f77c9dba4bd1a8762b5f

Implement ThreadReference.OwnedMonitorsStackDepthInfo.

Change-Id: I5e1ac7b2aeef7b1eac9518eba14a8f6555acd712

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 8724327..1ddb525 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -669,7 +669,9 @@
   return JDWP::ERR_NONE;
 }
 
-JDWP::JdwpError Dbg::GetOwnedMonitors(JDWP::ObjectId thread_id, std::vector<JDWP::ObjectId>& monitors)
+JDWP::JdwpError Dbg::GetOwnedMonitors(JDWP::ObjectId thread_id,
+                                      std::vector<JDWP::ObjectId>& monitors,
+                                      std::vector<uint32_t>& stack_depths)
     SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
   ScopedObjectAccessUnchecked soa(Thread::Current());
   MutexLock mu(soa.Self(), *Locks::thread_list_lock_);
@@ -686,28 +688,34 @@
     OwnedMonitorVisitor(const ManagedStack* stack,
                         const std::deque<InstrumentationStackFrame>* instrumentation_stack)
         SHARED_LOCKS_REQUIRED(Locks::mutator_lock_)
-        : StackVisitor(stack, instrumentation_stack, NULL) {}
+        : StackVisitor(stack, instrumentation_stack, NULL), current_stack_depth(0) {}
 
     // TODO: Enable annotalysis. We know lock is held in constructor, but abstraction confuses
     // annotalysis.
     bool VisitFrame() NO_THREAD_SAFETY_ANALYSIS {
       if (!GetMethod()->IsRuntimeMethod()) {
         Monitor::VisitLocks(this, AppendOwnedMonitors, this);
+        ++current_stack_depth;
       }
       return true;
     }
 
     static void AppendOwnedMonitors(Object* owned_monitor, void* context) {
-      reinterpret_cast<OwnedMonitorVisitor*>(context)->monitors.push_back(owned_monitor);
+      OwnedMonitorVisitor* visitor = reinterpret_cast<OwnedMonitorVisitor*>(context);
+      visitor->monitors.push_back(owned_monitor);
+      visitor->stack_depths.push_back(visitor->current_stack_depth);
     }
 
+    size_t current_stack_depth;
     std::vector<Object*> monitors;
+    std::vector<uint32_t> stack_depths;
   };
   OwnedMonitorVisitor visitor(thread->GetManagedStack(), thread->GetInstrumentationStack());
   visitor.WalkStack();
 
   for (size_t i = 0; i < visitor.monitors.size(); ++i) {
     monitors.push_back(gRegistry->Add(visitor.monitors[i]));
+    stack_depths.push_back(visitor.stack_depths[i]);
   }
 
   return JDWP::ERR_NONE;