commit 88e1ddd4078c0aa1305e1f50d7bf330062f4defe
author Alex Light <allight@google.com> Mon Aug 21 13:09:55 2017 -0700
committer Alex Light <allight@google.com> Thu Aug 24 16:31:00 2017 -0700
tree aa779320c587f83d5b86e3f24e572bf9aa76d493
parent db65a35f703132ee02790d6fa04bcf9513d7da79

Enable JVMTI GetOwnedMonitorInfo and GetOwnedMonitorStackDepthInfo

This enables the can_get_owned_monitor_info and
can_get_owned_monitor_stack_depth_info JVMTI capabilities and
implements all associated behaviors and functions.

Test: ./test.py --host -j50
Bug: 34415266
Bug: 62821960

Change-Id: Ia88d042259d5b15a4718f0b7698df7e7add87f1d

openjdkjvmti/OpenjdkJvmTi.cc

diff --git a/openjdkjvmti/OpenjdkJvmTi.cc b/openjdkjvmti/OpenjdkJvmTi.cc
index af77072..1cca36b 100644
--- a/openjdkjvmti/OpenjdkJvmTi.cc
+++ b/openjdkjvmti/OpenjdkJvmTi.cc
@@ -183,22 +183,27 @@
   }
 
   static jvmtiError GetOwnedMonitorInfo(jvmtiEnv* env,
-                                        jthread thread ATTRIBUTE_UNUSED,
-                                        jint* owned_monitor_count_ptr ATTRIBUTE_UNUSED,
-                                        jobject** owned_monitors_ptr ATTRIBUTE_UNUSED) {
+                                        jthread thread,
+                                        jint* owned_monitor_count_ptr,
+                                        jobject** owned_monitors_ptr) {
     ENSURE_VALID_ENV(env);
     ENSURE_HAS_CAP(env, can_get_owned_monitor_info);
-    return ERR(NOT_IMPLEMENTED);
+    return StackUtil::GetOwnedMonitorInfo(env,
+                                          thread,
+                                          owned_monitor_count_ptr,
+                                          owned_monitors_ptr);
   }
 
-  static jvmtiError GetOwnedMonitorStackDepthInfo(
-      jvmtiEnv* env,
-      jthread thread ATTRIBUTE_UNUSED,
-      jint* monitor_info_count_ptr ATTRIBUTE_UNUSED,
-      jvmtiMonitorStackDepthInfo** monitor_info_ptr ATTRIBUTE_UNUSED) {
+  static jvmtiError GetOwnedMonitorStackDepthInfo(jvmtiEnv* env,
+                                                  jthread thread,
+                                                  jint* monitor_info_count_ptr,
+                                                  jvmtiMonitorStackDepthInfo** monitor_info_ptr) {
     ENSURE_VALID_ENV(env);
     ENSURE_HAS_CAP(env, can_get_owned_monitor_stack_depth_info);
-    return ERR(NOT_IMPLEMENTED);
+    return StackUtil::GetOwnedMonitorStackDepthInfo(env,
+                                                    thread,
+                                                    monitor_info_count_ptr,
+                                                    monitor_info_ptr);
   }
 
   static jvmtiError GetCurrentContendedMonitor(jvmtiEnv* env,