--- old/make/test/JtregNative.gmk 2017-08-07 09:27:45.893678162 +0900 +++ new/make/test/JtregNative.gmk 2017-08-07 09:27:45.767675568 +0900 @@ -61,6 +61,7 @@ $(HOTSPOT_TOPDIR)/test/runtime/noClassDefFoundMsg \ $(HOTSPOT_TOPDIR)/test/compiler/floatingpoint/ \ $(HOTSPOT_TOPDIR)/test/compiler/calls \ + $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetOwnedMonitorInfo \ $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetNamedModule \ $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/IsModifiableModule \ $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleReads \ @@ -92,6 +93,7 @@ ifeq ($(TOOLCHAIN_TYPE), solstudio) BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liboverflow := -lc BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSimpleClassFileLoadHook := -lc + BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetOwnedMonitorInfoTest := -lc BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetNamedModuleTest := -lc BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsModifiableModuleTest := -lc BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libAddModuleReadsTest := -lc --- old/src/share/vm/runtime/objectMonitor.cpp 2017-08-07 09:27:46.218684854 +0900 +++ new/src/share/vm/runtime/objectMonitor.cpp 2017-08-07 09:27:46.124682919 +0900 @@ -307,6 +307,8 @@ { // Change java thread status to indicate blocked on monitor enter. JavaThreadBlockedOnMonitorEnterState jtbmes(jt, this); + Self->set_current_pending_monitor(this); + DTRACE_MONITOR_PROBE(contended__enter, this, object(), jt); if (JvmtiExport::should_post_monitor_contended_enter()) { JvmtiExport::post_monitor_contended_enter(jt, this); @@ -321,8 +323,6 @@ OSThreadContendState osts(Self->osthread()); ThreadBlockInVM tbivm(jt); - Self->set_current_pending_monitor(this); - // TODO-FIXME: change the following for(;;) loop to straight-line code. for (;;) { jt->set_suspend_equivalent(); --- /dev/null 2017-08-07 09:17:43.097837410 +0900 +++ new/test/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java 2017-08-07 09:27:46.461689857 +0900 @@ -0,0 +1,84 @@ +/* + * 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. + */ + + +/** + * @test + * @summary Verifies the JVMTI GetOwnedMonitorInfo API + * @modules jdk.jdi + * @compile GetOwnedMonitorInfoTest.java + * @run main/othervm/native -agentlib:GetOwnedMonitorInfoTest GetOwnedMonitorInfoTest + */ + +import java.io.PrintStream; + +public class GetOwnedMonitorInfoTest implements Runnable { + + static { + try { + System.loadLibrary("GetOwnedMonitorInfoTest"); + } catch (UnsatisfiedLinkError ule) { + System.err.println("Could not load GetOwnedMonitorInfoTest library"); + System.err.println("java.library.path: " + + System.getProperty("java.library.path")); + throw ule; + } + } + + native static int check(); + native static boolean hasEventPosted(); + + public void run() { + String name = Thread.currentThread().getName(); + try { + synchronized (GetOwnedMonitorInfoTest.class) { + System.out.println("Thread in sync section: " + name); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void main(String[] args) throws Exception { + Thread t1 = new Thread(new GetOwnedMonitorInfoTest()); + + // Make sure t1 contends on the monitor. + synchronized (GetOwnedMonitorInfoTest.class) { + System.out.println("Main starting worker thread."); + t1.start(); + + // Wait for the MonitorContendedEnter event + while (!hasEventPosted()) { + System.out.println("Main waiting for event."); + Thread.sleep(100); + } + } + + t1.join(); + + int status = check(); + if (status != 0) { + throw new RuntimeException("FAILED status returned from the agent"); + } + } +} --- /dev/null 2017-08-07 09:17:43.097837410 +0900 +++ new/test/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c 2017-08-07 09:27:46.716695108 +0900 @@ -0,0 +1,219 @@ +/* + * 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 +#include +#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 volatile jboolean event_has_posted = JNI_FALSE; +static volatile 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) { + jvmtiError err; + jvmtiThreadInfo threadInfo; + jint monitorCount; + jobject *ownedMonitors; + + err = (*jvmti)->GetThreadInfo(jvmti, thread, &threadInfo); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "MonitorContendedEnter: error in JVMTI GetThreadInfo: %d\n", err); + status = FAILED; + event_has_posted = JNI_TRUE; + return; + } + err = (*jvmti)->GetOwnedMonitorInfo(jvmti, thread, &monitorCount, &ownedMonitors); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "MonitorContendedEnter: error in JVMTI GetOwnedMonitorInfo: %d\n", err); + status = FAILED; + event_has_posted = JNI_TRUE; + return; + } + + 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) { + fprintf(stderr, "MonitorContendedEnter: FAIL: monitorCount should be zero.\n"); + status = FAILED; + } + + event_has_posted = JNI_TRUE; +} + +JNIEXPORT void JNICALL +MonitorContendedEntered(jvmtiEnv *jvmti, JNIEnv *env, jthread thread, jobject monitor) { + jvmtiError err; + jvmtiThreadInfo threadInfo; + jint monitorCount; + jobject *ownedMonitors; + + err = (*jvmti)->GetThreadInfo(jvmti, thread, &threadInfo); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "MonitorContendedEntered: error in JVMTI GetThreadInfo: %d\n", err); + status = FAILED; + return; + } + err = (*jvmti)->GetOwnedMonitorInfo(jvmti, thread, &monitorCount, &ownedMonitors); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "MonitorContendedEntered: error in JVMTI GetOwnedMonitorInfo: %d\n", err); + status = FAILED; + return; + } + + 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) { + fprintf(stderr, "MonitorContendedEnter: FAIL: monitorCount should be one.\n"); + 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) { + fprintf(stderr, "Error: wrong result of a valid call to GetEnv!\n"); + return JNI_ERR; + } + + err = (*jvmti)->GetPotentialCapabilities(jvmti, &caps); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "Agent_OnLoad: error in JVMTI GetPotentialCapabilities: %d\n", err); + return JNI_ERR; + } + + err = (*jvmti)->AddCapabilities(jvmti, &caps); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "Agent_OnLoad: error in JVMTI AddCapabilities: %d\n", err); + return JNI_ERR; + } + + err = (*jvmti)->GetCapabilities(jvmti, &caps); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "Agent_OnLoad: error in JVMTI GetCapabilities: %d\n", err); + return JNI_ERR; + } + + if (!caps.can_generate_monitor_events) { + fprintf(stderr, "Warning: Monitor events are not implemented\n"); + return JNI_ERR; + } + if (!caps.can_get_owned_monitor_info) { + fprintf(stderr, "Warning: GetOwnedMonitorInfo is not implemented\n"); + return JNI_ERR; + } + + callbacks.MonitorContendedEnter = &MonitorContendedEnter; + callbacks.MonitorContendedEntered = &MonitorContendedEntered; + + err = (*jvmti)->SetEventCallbacks(jvmti, &callbacks, sizeof(jvmtiEventCallbacks)); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "Agent_OnLoad: error in JVMTI SetEventCallbacks: %d\n", err); + return JNI_ERR; + } + + err = (*jvmti)->SetEventNotificationMode(jvmti, JVMTI_ENABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "Agent_OnLoad: error in JVMTI SetEventNotificationMode #1: %d\n", err); + return JNI_ERR; + } + err = (*jvmti)->SetEventNotificationMode(jvmti, JVMTI_ENABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL); + if (err != JVMTI_ERROR_NONE) { + fprintf(stderr, "Agent_OnLoad: error in JVMTI SetEventNotificationMode #2: %d\n", err); + return JNI_ERR; + } + printf("Agent_OnLoad finished\n"); + return JNI_OK; +} + +JNIEXPORT jint JNICALL +Java_GetOwnedMonitorInfoTest_check(JNIEnv *env, jclass cls) { + return status; +} + +JNIEXPORT jboolean JNICALL +Java_GetOwnedMonitorInfoTest_hasEventPosted(JNIEnv *env, jclass cls) { + return event_has_posted; +} + +#ifdef __cplusplus +} +#endif