stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8242328: Update mentions of ThreadMBean to ThreadMXBean

Browse Source 
Reviewed-by: dholmes, iignatyev, sspitsyn
This commit is contained in:
Leonid Mesnik 2020-06-12 14:33:55 -07:00
parent 8c90f4c0a7
commit bac2e7fcad
13 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/classfile/vmSymbols.hpp
View File

@ -598,12 +598,6 @@
template(createGCNotification_name, "createGCNotification") \ template(createGCNotification_name, "createGCNotification") \
template(createGCNotification_signature, "(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/sun/management/GcInfo;)V") \ template(createGCNotification_signature, "(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/sun/management/GcInfo;)V") \
template(createDiagnosticFrameworkNotification_name, "createDiagnosticFrameworkNotification") \ template(createDiagnosticFrameworkNotification_name, "createDiagnosticFrameworkNotification") \
template(createMemoryPoolMBean_name, "createMemoryPoolMBean") \
template(createMemoryManagerMBean_name, "createMemoryManagerMBean") \
template(createGarbageCollectorMBean_name, "createGarbageCollectorMBean") \
template(createMemoryPoolMBean_signature, "(Ljava/lang/String;ZJJ)Ljava/lang/management/MemoryPoolMBean;") \
template(createMemoryManagerMBean_signature, "(Ljava/lang/String;)Ljava/lang/management/MemoryManagerMBean;") \
template(createGarbageCollectorMBean_signature, "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/management/GarbageCollectorMBean;") \
template(trigger_name, "trigger") \ template(trigger_name, "trigger") \
template(clear_name, "clear") \ template(clear_name, "clear") \
template(trigger_method_signature, "(ILjava/lang/management/MemoryUsage;)V") \ template(trigger_method_signature, "(ILjava/lang/management/MemoryUsage;)V") \

4
src/hotspot/share/compiler/compileBroker.cpp
View File

@ -687,7 +687,7 @@ void CompileBroker::compilation_init_phase1(Thread* THREAD) {
// Start the compiler thread(s) and the sweeper thread // Start the compiler thread(s) and the sweeper thread
init_compiler_sweeper_threads(); init_compiler_sweeper_threads();
// totalTime performance counter is always created as it is required // totalTime performance counter is always created as it is required
// by the implementation of java.lang.management.CompilationMBean. // by the implementation of java.lang.management.CompilationMXBean.
{ {
// Ensure OOM leads to vm_exit_during_initialization. // Ensure OOM leads to vm_exit_during_initialization.
EXCEPTION_MARK; EXCEPTION_MARK;
@ -2478,7 +2478,7 @@ void CompileBroker::collect_statistics(CompilerThread* thread, elapsedTimer time
// Compilation succeeded // Compilation succeeded
// update compilation ticks - used by the implementation of // update compilation ticks - used by the implementation of
// java.lang.management.CompilationMBean // java.lang.management.CompilationMXBean
_perf_total_compilation->inc(time.ticks()); _perf_total_compilation->inc(time.ticks());
_peak_compilation_time = time.milliseconds() > _peak_compilation_time ? time.milliseconds() : _peak_compilation_time; _peak_compilation_time = time.milliseconds() > _peak_compilation_time ? time.milliseconds() : _peak_compilation_time;

4
src/java.management/share/classes/sun/management/HotspotThreadMBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -50,7 +50,7 @@ public interface HotspotThreadMBean {
* @throws java.lang.UnsupportedOperationException if the Java virtual * @throws java.lang.UnsupportedOperationException if the Java virtual
* machine does not support CPU time measurement. * machine does not support CPU time measurement.
* *
* @see java.lang.management.ThreadMBean#isThreadCpuTimeSupported * @see java.lang.management.ThreadMXBean#isThreadCpuTimeSupported
*/ */
public java.util.Map<String,Long> getInternalThreadCpuTimes(); public java.util.Map<String,Long> getInternalThreadCpuTimes();

2
src/jdk.management.agent/share/conf/management.properties
View File

@ -41,7 +41,7 @@
# #
# This option enables thread contention monitoring if the # This option enables thread contention monitoring if the
# Java virtual machine supports such instrumentation. # Java virtual machine supports such instrumentation.
# Refer to the specification for the java.lang.management.ThreadMBean # Refer to the specification for the java.lang.management.ThreadMXBean
# interface - see isThreadContentionMonitoringSupported() method. # interface - see isThreadContentionMonitoringSupported() method.
# #

4
src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,7 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GarbageCollectorExtImpl_
(JNIEnv *env, jobject dummy, jobject gc,jboolean enabled) { (JNIEnv *env, jobject dummy, jobject gc,jboolean enabled) {
if (gc == NULL) { if (gc == NULL) {
JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean"); JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
return; return;
} }
if((jmm_version > JMM_VERSION_1_2) if((jmm_version > JMM_VERSION_1_2)

8
src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,7 @@ JNIEXPORT jint JNICALL Java_com_sun_management_internal_GcInfoBuilder_getNumGcEx
jlong value; jlong value;
if (gc == NULL) { if (gc == NULL) {
JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean"); JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
return 0; return 0;
} }
value = jmm_interface->GetLongAttribute(env, gc, value = jmm_interface->GetLongAttribute(env, gc,
@ -55,7 +55,7 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GcInfoBuilder_fillGcAttr
jint i; jint i;
if (gc == NULL) { if (gc == NULL) {
JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean"); JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
return; return;
} }
@ -207,7 +207,7 @@ JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLast
jvalue v; jvalue v;
if (gc == NULL) { if (gc == NULL) {
JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean"); JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
return 0; return 0;
} }

2
test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon001/comptimemon001.java
View File

@ -32,7 +32,7 @@
* VM Testbase readme: * VM Testbase readme:
* DESCRIPTION * DESCRIPTION
* The test checks that * The test checks that
* CompilationMBean.isCompilationTimeMonitoringSupported() * CompilationMXBean.isCompilationTimeMonitoringSupported()
* method returns true. The test performs directly access to management * method returns true. The test performs directly access to management
* metrics within the same JVM. * metrics within the same JVM.
* Note, that the test is correct ONLY against Sun's Hotspot VM. This * Note, that the test is correct ONLY against Sun's Hotspot VM. This

3
test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon002/TestDescription.java
View File

@ -31,7 +31,7 @@
* VM Testbase readme: * VM Testbase readme:
* DESCRIPTION * DESCRIPTION
* The test checks that * The test checks that
* CompilationMBean.isCompilationTimeMonitoringSupported() * CompilationMXBean.isCompilationTimeMonitoringSupported()
* method returns true. The test performs access to management metrics * method returns true. The test performs access to management metrics
* through default MBeanServer. * through default MBeanServer.
* Note, that the test is correct ONLY against Sun's Hotspot VM. This * Note, that the test is correct ONLY against Sun's Hotspot VM. This
@ -50,4 +50,3 @@
* nsk.monitoring.CompilationMXBean.comptimemon001.comptimemon001 * nsk.monitoring.CompilationMXBean.comptimemon001.comptimemon001
* -testMode=server * -testMode=server
*/ */

3
test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon003/TestDescription.java
View File

@ -31,7 +31,7 @@
* VM Testbase readme: * VM Testbase readme:
* DESCRIPTION * DESCRIPTION
* The test checks that * The test checks that
* CompilationMBean.isCompilationTimeMonitoringSupported() * CompilationMXBean.isCompilationTimeMonitoringSupported()
* method returns true. The test performs access to management metrics * method returns true. The test performs access to management metrics
* through custom MBeanServer (developed and saved in * through custom MBeanServer (developed and saved in
* $TESTBASE/src/nsk/monitoring/share). * $TESTBASE/src/nsk/monitoring/share).
@ -52,4 +52,3 @@
* -testMode=server * -testMode=server
* -MBeanServer=custom * -MBeanServer=custom
*/ */

3
test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon004/TestDescription.java
View File

@ -31,7 +31,7 @@
* VM Testbase readme: * VM Testbase readme:
* DESCRIPTION * DESCRIPTION
* The test checks that * The test checks that
* CompilationMBean.isCompilationTimeMonitoringSupported() * CompilationMXBean.isCompilationTimeMonitoringSupported()
* method returns true. The test performs access to management metrics * method returns true. The test performs access to management metrics
* through default MBeanServer proxy. * through default MBeanServer proxy.
* Note, that the test is correct ONLY against Sun's Hotspot VM. This * Note, that the test is correct ONLY against Sun's Hotspot VM. This
@ -50,4 +50,3 @@
* nsk.monitoring.CompilationMXBean.comptimemon001.comptimemon001 * nsk.monitoring.CompilationMXBean.comptimemon001.comptimemon001
* -testMode=proxy * -testMode=proxy
*/ */

3
test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon005/TestDescription.java
View File

@ -31,7 +31,7 @@
* VM Testbase readme: * VM Testbase readme:
* DESCRIPTION * DESCRIPTION
* The test checks that * The test checks that
* CompilationMBean.isCompilationTimeMonitoringSupported() * CompilationMXBean.isCompilationTimeMonitoringSupported()
* method returns true. The test performs access to management metrics * method returns true. The test performs access to management metrics
* through custom MBeanServer proxy (developed and saved in * through custom MBeanServer proxy (developed and saved in
* $TESTBASE/src/nsk/monitoring/share). * $TESTBASE/src/nsk/monitoring/share).
@ -52,4 +52,3 @@
* -testMode=proxy * -testMode=proxy
* -MBeanServer=custom * -MBeanServer=custom
*/ */

2
test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
View File

@ -39,7 +39,7 @@ com.sun.management.jmxremote.port=${getFreePort}
# #
# This option enables thread contention monitoring if the # This option enables thread contention monitoring if the
# Java virtual machine supports such instrumentation. # Java virtual machine supports such instrumentation.
# Refer to the specification for the java.lang.management.ThreadMBean # Refer to the specification for the java.lang.management.ThreadMXBean
# interface - see isThreadContentionMonitoringSupported() method. # interface - see isThreadContentionMonitoringSupported() method.
# #

2
test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
View File

@ -39,7 +39,7 @@ com.sun.management.jmxremote.port=${getFreePort}
# #
# This option enables thread contention monitoring if the # This option enables thread contention monitoring if the
# Java virtual machine supports such instrumentation. # Java virtual machine supports such instrumentation.
# Refer to the specification for the java.lang.management.ThreadMBean # Refer to the specification for the java.lang.management.ThreadMXBean
# interface - see isThreadContentionMonitoringSupported() method. # interface - see isThreadContentionMonitoringSupported() method.
# #