commit ec0f83d95e2174c97e93279ffa71642be7e12b60
author Elliott Hughes <enh@google.com> Tue Jan 15 16:54:08 2013 -0800
committer Elliott Hughes <enh@google.com> Tue Jan 15 16:54:08 2013 -0800
tree b8ac0c238f6dddff2e49fb2002834a369594abb1
parent 4028312f6f4b49fd69992daf28cd37dd32e79a47

Implement JDWP VirtualMachine.InstanceCounts.

Change-Id: I6df66787dee8af67f65460023bcf223eec1ec7da

src/debugger.h

diff --git a/src/debugger.h b/src/debugger.h
index 1acd09b..1bad6cc 100644
--- a/src/debugger.h
+++ b/src/debugger.h
@@ -151,15 +151,6 @@
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   static size_t GetTagWidth(JDWP::JdwpTag tag);
 
-  static JDWP::JdwpError GetMonitorInfo(JDWP::ObjectId object_id, JDWP::ExpandBuf* reply)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-  static JDWP::JdwpError GetOwnedMonitors(JDWP::ObjectId thread_id,
-                                          std::vector<JDWP::ObjectId>& monitors,
-                                          std::vector<uint32_t>& stack_depths)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-  static JDWP::JdwpError GetContendedMonitor(JDWP::ObjectId thread_id, JDWP::ObjectId& contended_monitor)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-
   static JDWP::JdwpError GetArrayLength(JDWP::ObjectId array_id, int& length)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   static JDWP::JdwpError OutputArray(JDWP::ObjectId array_id, int offset, int count,
@@ -180,6 +171,25 @@
   static bool MatchType(JDWP::RefTypeId instance_class_id, JDWP::RefTypeId class_id)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
+  //
+  // Monitors.
+  //
+  static JDWP::JdwpError GetMonitorInfo(JDWP::ObjectId object_id, JDWP::ExpandBuf* reply)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  static JDWP::JdwpError GetOwnedMonitors(JDWP::ObjectId thread_id,
+                                          std::vector<JDWP::ObjectId>& monitors,
+                                          std::vector<uint32_t>& stack_depths)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  static JDWP::JdwpError GetContendedMonitor(JDWP::ObjectId thread_id, JDWP::ObjectId& contended_monitor)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+
+  //
+  // Heap.
+  //
+  static JDWP::JdwpError GetInstanceCounts(const std::vector<JDWP::RefTypeId>& class_ids,
+                                           std::vector<uint64_t>& counts)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+
   /*
    * Method and Field
    */