8242295: Change ThreadMBean in vmTestbase/nsk/monitoring to ThreadMXBean

Reviewed-by: iignatyev

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/findMonitorDeadlockedThreads/find001.java → test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find001.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package nsk.monitoring.ThreadMBean.findMonitorDeadlockedThreads;
+package nsk.monitoring.ThreadMXBean.findMonitorDeadlockedThreads;
 
 import java.io.*;
 import nsk.share.*;

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find001/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,14 +30,14 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.findMonitorDeadlockedThreads()
+ *         ThreadMXBean.findMonitorDeadlockedThreads()
  *     does not return the id of the currect thread, since it is not deadlocked.
  *     The test implements direct access to the metrics.
  * COMMENT
  *
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
- * @run main/othervm nsk.monitoring.ThreadMBean.findMonitorDeadlockedThreads.find001
+ * @run main/othervm nsk.monitoring.ThreadMXBean.findMonitorDeadlockedThreads.find001
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find002/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.findMonitorDeadlockedThreads()
+ *         ThreadMXBean.findMonitorDeadlockedThreads()
  *     does not return the id of the currect thread, since it is not deadlocked.
  *     The test implements access to the metrics via default MBean server.
  * COMMENT
@@ -39,7 +39,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.findMonitorDeadlockedThreads.find001
+ *      nsk.monitoring.ThreadMXBean.findMonitorDeadlockedThreads.find001
  *      -testMode=server
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find003/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.findMonitorDeadlockedThreads()
+ *         ThreadMXBean.findMonitorDeadlockedThreads()
  *     does not return the id of the currect thread, since it is not deadlocked.
  *     The test implements access to the metrics via custom MBean server.
  * COMMENT
@@ -39,7 +39,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.findMonitorDeadlockedThreads.find001
+ *      nsk.monitoring.ThreadMXBean.findMonitorDeadlockedThreads.find001
  *      -testMode=server
  *      -MBeanServer=custom
  */

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find004/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,14 +30,14 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.findMonitorDeadlockedThreads()
+ *         ThreadMXBean.findMonitorDeadlockedThreads()
  *     does not return the id of the currect thread, since it is not deadlocked.
  *     The test implements access to the metrics via default MBean server proxy.
  * COMMENT
  *
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
- * @run main/othervm nsk.monitoring.ThreadMBean.findMonitorDeadlockedThreads.find001 -testMode=proxy
+ * @run main/othervm nsk.monitoring.ThreadMXBean.findMonitorDeadlockedThreads.find001 -testMode=proxy
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find005/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.findMonitorDeadlockedThreads()
+ *         ThreadMXBean.findMonitorDeadlockedThreads()
  *     does not return the id of the currect thread, since it is not deadlocked.
  *     The test implements access to the metrics via custom MBean server proxy.
  * COMMENT
@@ -39,7 +39,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.findMonitorDeadlockedThreads.find001
+ *      nsk.monitoring.ThreadMXBean.findMonitorDeadlockedThreads.find001
  *      -testMode=proxy
  *      -MBeanServer=custom
  */

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/isCurrentThreadCpuTimeSupported/curthcputime001.java → test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime001.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package nsk.monitoring.ThreadMBean.isCurrentThreadCpuTimeSupported;
+package nsk.monitoring.ThreadMXBean.isCurrentThreadCpuTimeSupported;
 
 import java.io.*;
 import nsk.share.*;

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime001/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isCurrentThreadCpuTimeSupported()
+ *         ThreadMXBean.isCurrentThreadCpuTimeSupported()
  *     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
@@ -43,6 +43,6 @@
  * @library /vmTestbase
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
- * @run main/othervm nsk.monitoring.ThreadMBean.isCurrentThreadCpuTimeSupported.curthcputime001
+ * @run main/othervm nsk.monitoring.ThreadMXBean.isCurrentThreadCpuTimeSupported.curthcputime001
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime002/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isCurrentThreadCpuTimeSupported()
+ *         ThreadMXBean.isCurrentThreadCpuTimeSupported()
  *     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
@@ -42,7 +42,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isCurrentThreadCpuTimeSupported.curthcputime001
+ *      nsk.monitoring.ThreadMXBean.isCurrentThreadCpuTimeSupported.curthcputime001
  *      -testMode=server
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime003/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isCurrentThreadCpuTimeSupported()
+ *         ThreadMXBean.isCurrentThreadCpuTimeSupported()
  *     method returns true. The test performs access to management metrics
  *     through custom MBeanServer (developed and saved in
  *     $TESTBASE/src/nsk/monitoring/share).
@@ -43,7 +43,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isCurrentThreadCpuTimeSupported.curthcputime001
+ *      nsk.monitoring.ThreadMXBean.isCurrentThreadCpuTimeSupported.curthcputime001
  *      -testMode=server
  *      -MBeanServer=custom
  */

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime004/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isCurrentThreadCpuTimeSupported()
+ *         ThreadMXBean.isCurrentThreadCpuTimeSupported()
  *     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
@@ -42,7 +42,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isCurrentThreadCpuTimeSupported.curthcputime001
+ *      nsk.monitoring.ThreadMXBean.isCurrentThreadCpuTimeSupported.curthcputime001
  *      -testMode=proxy
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime005/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isCurrentThreadCpuTimeSupported()
+ *         ThreadMXBean.isCurrentThreadCpuTimeSupported()
  *     method returns true. The test performs access to management metrics
  *     through custom MBeanServer proxy (developed and saved in
  *     $TESTBASE/src/nsk/monitoring/share).
@@ -43,7 +43,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isCurrentThreadCpuTimeSupported.curthcputime001
+ *      nsk.monitoring.ThreadMXBean.isCurrentThreadCpuTimeSupported.curthcputime001
  *      -testMode=proxy
  *      -MBeanServer=custom
  */

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/isThreadContentionMonitoringSupported/thcontmonitor001.java → test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor001.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package nsk.monitoring.ThreadMBean.isThreadContentionMonitoringSupported;
+package nsk.monitoring.ThreadMXBean.isThreadContentionMonitoringSupported;
 
 import java.io.*;
 import nsk.share.*;

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor001/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isThreadContentionMonitoringSupported()
+ *         ThreadMXBean.isThreadContentionMonitoringSupported()
  *     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
@@ -44,6 +44,6 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isThreadContentionMonitoringSupported.thcontmonitor001
+ *      nsk.monitoring.ThreadMXBean.isThreadContentionMonitoringSupported.thcontmonitor001
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor002/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isThreadContentionMonitoringSupported()
+ *         ThreadMXBean.isThreadContentionMonitoringSupported()
  *     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
@@ -42,7 +42,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isThreadContentionMonitoringSupported.thcontmonitor001
+ *      nsk.monitoring.ThreadMXBean.isThreadContentionMonitoringSupported.thcontmonitor001
  *      -testMode=server
  */
 

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor003/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isThreadContentionMonitoringSupported()
+ *         ThreadMXBean.isThreadContentionMonitoringSupported()
  *     method returns true. The test performs access to management metrics
  *     through custom MBeanServer (developed and saved in
  *     $TESTBASE/src/nsk/monitoring/share).
@@ -43,7 +43,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isThreadContentionMonitoringSupported.thcontmonitor001
+ *      nsk.monitoring.ThreadMXBean.isThreadContentionMonitoringSupported.thcontmonitor001
  *      -testMode=server
  *      -MBeanServer=custom
  */

test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor004/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,7 @@
  * VM Testbase readme:
  * DESCRIPTION
  *     The test checks that
- *         ThreadMBean.isThreadContentionMonitoringSupported()
+ *         ThreadMXBean.isThreadContentionMonitoringSupported()
  *     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
@@ -42,7 +42,7 @@
  *          /test/lib
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm
- *      nsk.monitoring.ThreadMBean.isThreadContentionMonitoringSupported.thcontmonitor001
+ *      nsk.monitoring.ThreadMXBean.isThreadContentionMonitoringSupported.thcontmonitor001
  *      -testMode=proxy
  */