--- /dev/null	2017-08-05 21:35:40.558828200 +0900
+++ new/test/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c	2017-08-05 22:27:00.876921040 +0900
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "jvmti.h"
+#include "jni.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef JNI_ENV_ARG
+
+#ifdef __cplusplus
+#define JNI_ENV_ARG(x, y) y
+#define JNI_ENV_PTR(x) x
+#else
+#define JNI_ENV_ARG(x,y) x, y
+#define JNI_ENV_PTR(x) (*x)
+#endif
+
+#endif
+
+#define TranslateError(err) "JVMTI error"
+
+#define PASSED 0
+#define FAILED 2
+
+static jint status = PASSED;
+
+static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
+
+JNIEXPORT void JNICALL
+MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv *env, jthread thread, jobject monitor) {
+    jvmtiThreadInfo threadInfo;
+    jint monitorCount;
+    jobject *ownedMonitors;
+
+    (*jvmti)->GetThreadInfo(jvmti, thread, &threadInfo);
+    (*jvmti)->GetOwnedMonitorInfo(jvmti, thread, &monitorCount, &ownedMonitors);
+
+    printf("MonitorContendedEnter: %s owns %d monitor(s)\n",
+           threadInfo.name, monitorCount);
+
+    (*jvmti)->Deallocate(jvmti, (unsigned char *)ownedMonitors);
+    (*jvmti)->Deallocate(jvmti, (unsigned char *)threadInfo.name);
+
+    if (monitorCount != 0) {
+        status = FAILED;
+    }
+}
+
+JNIEXPORT void JNICALL
+MonitorContendedEntered(jvmtiEnv *jvmti, JNIEnv *env, jthread thread, jobject monitor) {
+    jvmtiThreadInfo threadInfo;
+    jint monitorCount;
+    jobject *ownedMonitors;
+
+    (*jvmti)->GetThreadInfo(jvmti, thread, &threadInfo);
+    (*jvmti)->GetOwnedMonitorInfo(jvmti, thread, &monitorCount, &ownedMonitors);
+
+    printf("MonitorContendedEntered: %s owns %d monitor(s)\n",
+           threadInfo.name, monitorCount);
+
+    (*jvmti)->Deallocate(jvmti, (unsigned char *)ownedMonitors);
+    (*jvmti)->Deallocate(jvmti, (unsigned char *)threadInfo.name);
+
+    if (monitorCount != 1) {
+        status = FAILED;
+    }
+}
+
+JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+    return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT jint JNICALL
+Agent_OnAttach(JavaVM *jvm, char *options, void *reserved) {
+    return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *jvm, void *reserved) {
+    return JNI_VERSION_1_8;
+}
+
+static
+jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+    jint res;
+    jvmtiError err;
+    jvmtiEnv *jvmti;
+    jvmtiCapabilities caps;
+    jvmtiEventCallbacks callbacks;
+
+    printf("Agent_OnLoad started\n");
+
+    res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
+                                   JVMTI_VERSION_1);
+    if (res != JNI_OK || jvmti == NULL) {
+        printf("    Error: wrong result of a valid call to GetEnv!\n");
+        return JNI_ERR;
+    }
+
+    err = (*jvmti)->GetPotentialCapabilities(jvmti, &caps);
+    if (err != JVMTI_ERROR_NONE) {
+        printf("Agent_OnLoad: error in JVMTI GetPotentialCapabilities: %d\n",  err);
+        return JNI_ERR;
+    }
+
+    err = (*jvmti)->AddCapabilities(jvmti, &caps);
+    if (err != JVMTI_ERROR_NONE) {
+        printf("Agent_OnLoad: error in JVMTI AddCapabilities: %d\n", err);
+    }
+
+    err = (*jvmti)->GetCapabilities(jvmti, &caps);
+    if (err != JVMTI_ERROR_NONE) {
+        printf("Agent_OnLoad: error in JVMTI GetCapabilities: %d\n",  err);
+        return JNI_ERR;
+    }
+
+    if (!caps.can_generate_monitor_events) {
+        printf("Warning: Monitor events are not implemented\n");
+    }
+    if (!caps.can_get_owned_monitor_info) {
+        printf("Warning: GetOwnedMonitorInfo is not implemented\n");
+    }
+
+    callbacks.MonitorContendedEnter   = &MonitorContendedEnter;
+    callbacks.MonitorContendedEntered = &MonitorContendedEntered;
+
+    err = (*jvmti)->SetEventCallbacks(jvmti, &callbacks, sizeof(jvmtiEventCallbacks));
+    if (err != JVMTI_ERROR_NONE) {
+        printf("Agent_OnLoad: error in JVMTI SetEventCallbacks: %d\n", err);
+    }
+
+    err = (*jvmti)->SetEventNotificationMode(jvmti, JVMTI_ENABLE,
+                                             JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL);
+    if (err != JVMTI_ERROR_NONE) {
+        printf("Agent_OnLoad: error in JVMTI SetEventNotificationMode #1: %d\n", err);
+    }
+    err = (*jvmti)->SetEventNotificationMode(jvmti, JVMTI_ENABLE,
+                                             JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL);
+    if (err != JVMTI_ERROR_NONE) {
+        printf("Agent_OnLoad: error in JVMTI SetEventNotificationMode #2: %d\n", err);
+    }
+    printf("Agent_OnLoad finished\n");
+    return JNI_OK;
+}
+
+JNIEXPORT jint JNICALL
+Java_GetOwnedMonitorInfoTest_check(JNIEnv *env, jclass cls) {
+    return status;
+}
+
+#ifdef __cplusplus
+}
+#endif