8242328: Update mentions of ThreadMBean to ThreadMXBean

lmesnik · lmesnik · commit bac2e7fcad8c · 2020-06-12T14:33:55.000-07:00
Reviewed-by: dholmes, iignatyev, sspitsyn
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -598,12 +598,6 @@
   template(createGCNotification_name,                  "createGCNotification")                                    \
   template(createGCNotification_signature,             "(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/sun/management/GcInfo;)V") \
   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(clear_name,                                 "clear")                                                   \
   template(trigger_method_signature,                   "(ILjava/lang/management/MemoryUsage;)V")                  \
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
@@ -687,7 +687,7 @@ void CompileBroker::compilation_init_phase1(Thread* THREAD) {
   // Start the compiler thread(s) and the sweeper thread
   init_compiler_sweeper_threads();
   // 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.
     EXCEPTION_MARK;
@@ -2478,7 +2478,7 @@ void CompileBroker::collect_statistics(CompilerThread* thread, elapsedTimer time
     // Compilation succeeded
 
     // update compilation ticks - used by the implementation of
-    // java.lang.management.CompilationMBean
+    // java.lang.management.CompilationMXBean
     _perf_total_compilation->inc(time.ticks());
     _peak_compilation_time = time.milliseconds() > _peak_compilation_time ? time.milliseconds() : _peak_compilation_time;
 
diff --git a/src/java.management/share/classes/sun/management/HotspotThreadMBean.java b/src/java.management/share/classes/sun/management/HotspotThreadMBean.java
@@ -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.
  *
  * 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
      * 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();
 
diff --git a/src/jdk.management.agent/share/conf/management.properties b/src/jdk.management.agent/share/conf/management.properties
@@ -41,7 +41,7 @@
 #
 #      This option enables thread contention monitoring if the
 #      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.
 #
 
@@ -228,7 +228,7 @@
 # com.sun.management.jmxremote.password.toHashes = true|false
 #      Default for this property is true.
 #      Specifies if passwords in the password file should be hashed or not.
-#      If this property is true, and if the password file is writable, and if the 
+#      If this property is true, and if the password file is writable, and if the
 #      system security policy allows writing into the password file,
 #      all the clear passwords in the password file will be replaced by
 #      their SHA3-512 hash when the file is read by the server
@@ -267,7 +267,7 @@
 # ################ Filter for ObjectInputStream #############################
 # com.sun.management.jmxremote.serial.filter.pattern=<filter-string>
 #   A filter, if configured, is used by java.io.ObjectInputStream during
-#   deserialization of parameters sent to the JMX default agent to validate the 
+#   deserialization of parameters sent to the JMX default agent to validate the
 #   contents of the stream.
 #   A filter is configured as a sequence of patterns, each pattern is either
 #   matched against the name of a class in the stream or defines a limit.
diff --git a/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c b/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c
@@ -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.
  *
  * 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) {
 
     if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
         return;
     }
     if((jmm_version > JMM_VERSION_1_2)
diff --git a/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c b/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c
@@ -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.
  *
  * 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;
 
     if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
         return 0;
     }
     value = jmm_interface->GetLongAttribute(env, gc,
@@ -55,7 +55,7 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GcInfoBuilder_fillGcAttr
     jint i;
 
     if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
         return;
     }
 
@@ -207,7 +207,7 @@ JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLast
     jvalue      v;
 
     if (gc == NULL) {
-        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");
+        JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
         return 0;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon001/comptimemon001.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon001/comptimemon001.java
@@ -32,7 +32,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         CompilationMBean.isCompilationTimeMonitoringSupported()
+ *         CompilationMXBean.isCompilationTimeMonitoringSupported()
  *     method returns true. The test performs directly access to management
  *     metrics within the same JVM.
  *     Note, that the test is correct ONLY against Sun's Hotspot VM. This
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon002/TestDescription.java
@@ -31,7 +31,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         CompilationMBean.isCompilationTimeMonitoringSupported()
+ *         CompilationMXBean.isCompilationTimeMonitoringSupported()
  *     method returns true. The test performs access to management metrics
  *     through default MBeanServer.
  *     Note, that the test is correct ONLY against Sun's Hotspot VM. This
@@ -50,4 +50,3 @@
  *      nsk.monitoring.CompilationMXBean.comptimemon001.comptimemon001
  *      -testMode=server
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon003/TestDescription.java
@@ -31,7 +31,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         CompilationMBean.isCompilationTimeMonitoringSupported()
+ *         CompilationMXBean.isCompilationTimeMonitoringSupported()
  *     method returns true. The test performs access to management metrics
  *     through custom MBeanServer (developed and saved in
  *     $TESTBASE/src/nsk/monitoring/share).
@@ -52,4 +52,3 @@
  *      -testMode=server
  *      -MBeanServer=custom
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon004/TestDescription.java
@@ -31,7 +31,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         CompilationMBean.isCompilationTimeMonitoringSupported()
+ *         CompilationMXBean.isCompilationTimeMonitoringSupported()
  *     method returns true. The test performs access to management metrics
  *     through default MBeanServer proxy.
  *     Note, that the test is correct ONLY against Sun's Hotspot VM. This
@@ -50,4 +50,3 @@
  *      nsk.monitoring.CompilationMXBean.comptimemon001.comptimemon001
  *      -testMode=proxy
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon005/TestDescription.java
@@ -31,7 +31,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         CompilationMBean.isCompilationTimeMonitoringSupported()
+ *         CompilationMXBean.isCompilationTimeMonitoringSupported()
  *     method returns true. The test performs access to management metrics
  *     through custom MBeanServer proxy (developed and saved in
  *     $TESTBASE/src/nsk/monitoring/share).
@@ -52,4 +52,3 @@
  *      -testMode=proxy
  *      -MBeanServer=custom
  */
-
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
@@ -39,7 +39,7 @@ com.sun.management.jmxremote.port=${getFreePort}
 #
 #      This option enables thread contention monitoring if the
 #      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.
 #
 
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
@@ -39,7 +39,7 @@ com.sun.management.jmxremote.port=${getFreePort}
 #
 #      This option enables thread contention monitoring if the
 #      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.
 #
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -50,7 +50,7 @@ public interface HotspotThreadMBean {`
`50`	`50`	`* @throws java.lang.UnsupportedOperationException if the Java virtual`
`51`	`51`	`* machine does not support CPU time measurement.`
`52`	`52`	`*`
`53`		`- * @see java.lang.management.ThreadMBean#isThreadCpuTimeSupported`
	`53`	`+ * @see java.lang.management.ThreadMXBean#isThreadCpuTimeSupported`
`54`	`54`	`*/`
`55`	`55`	`public java.util.Map<String,Long> getInternalThreadCpuTimes();`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* 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_`
`31`	`31`	`(JNIEnv *env, jobject dummy, jobject gc,jboolean enabled) {`
`32`	`32`
`33`	`33`	`if (gc == NULL) {`
`34`		`- JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMBean");`
	`34`	`+ JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`	`if((jmm_version > JMM_VERSION_1_2)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ com.sun.management.jmxremote.port=${getFreePort}`
`39`	`39`	`#`
`40`	`40`	`# This option enables thread contention monitoring if the`
`41`	`41`	`# Java virtual machine supports such instrumentation.`
`42`		`-# Refer to the specification for the java.lang.management.ThreadMBean`
	`42`	`+# Refer to the specification for the java.lang.management.ThreadMXBean`
`43`	`43`	`# interface - see isThreadContentionMonitoringSupported() method.`
`44`	`44`	`#`
`45`	`45`