Skip to content
Permalink
Browse files

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

Reviewed-by: iignatyev
  • Loading branch information
lmesnik committed Apr 8, 2020
1 parent ac8d420 commit 3a6249d0c7ba8eb9fd2e67a8a51fdb36519265d9
Showing with 107 additions and 108 deletions.
  1. +2 −2 .../vmTestbase/nsk/monitoring/{ThreadMBean → ThreadMXBean}/findMonitorDeadlockedThreads/find001.java
  2. +3 −3 .../vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find001/TestDescription.java
  3. +3 −3 .../vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find002/TestDescription.java
  4. +3 −3 .../vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find003/TestDescription.java
  5. +3 −3 .../vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find004/TestDescription.java
  6. +3 −3 .../vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find005/TestDescription.java
  7. +2 −2 .../nsk/monitoring/{ThreadMBean → ThreadMXBean}/isCurrentThreadCpuTimeSupported/curthcputime001.java
  8. +3 −3 .../nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime001/TestDescription.java
  9. +3 −3 .../nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime002/TestDescription.java
  10. +3 −3 .../nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime003/TestDescription.java
  11. +3 −3 .../nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime004/TestDescription.java
  12. +3 −3 .../nsk/monitoring/ThreadMXBean/isCurrentThreadCpuTimeSupported/curthcputime005/TestDescription.java
  13. +2 −2 ...nitoring/{ThreadMBean → ThreadMXBean}/isThreadContentionMonitoringSupported/thcontmonitor001.java
  14. +3 −3 ...nitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor001/TestDescription.java
  15. +3 −3 ...nitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor002/TestDescription.java
  16. +3 −3 ...nitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor003/TestDescription.java
  17. +3 −3 ...nitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor004/TestDescription.java
  18. +3 −3 ...nitoring/ThreadMXBean/isThreadContentionMonitoringSupported/thcontmonitor005/TestDescription.java
  19. +2 −2 ...vmTestbase/nsk/monitoring/{ThreadMBean → ThreadMXBean}/isThreadCpuTimeSupported/thcputime001.java
  20. +3 −3 ...vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime001/TestDescription.java
  21. +3 −3 ...vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime002/TestDescription.java
  22. +3 −3 ...vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime003/TestDescription.java
  23. +3 −3 ...vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime004/TestDescription.java
  24. +3 −3 ...vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime005/TestDescription.java
  25. +2 −2 ...t/jtreg/vmTestbase/nsk/monitoring/{ThreadMBean → ThreadMXBean}/resetPeakThreadCount/reset001.java
  26. +3 −3 ...t/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001/TestDescription.java
  27. +3 −3 ...t/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset002/TestDescription.java
  28. +3 −3 ...t/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset003/TestDescription.java
  29. +3 −3 ...t/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset004/TestDescription.java
  30. +3 −3 ...t/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset005/TestDescription.java
  31. +4 −4 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace010.java
  32. +2 −3 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace010/TestDescription.java
  33. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace011/TestDescription.java
  34. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace012/TestDescription.java
  35. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace013/TestDescription.java
  36. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace014/TestDescription.java
  37. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace015/TestDescription.java
  38. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace016/TestDescription.java
  39. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace017/TestDescription.java
  40. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace018/TestDescription.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.*;
@@ -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
*/

@@ -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
*/

@@ -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
*/
@@ -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
*/

@@ -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
*/
@@ -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.*;
@@ -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
*/

@@ -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
*/

@@ -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
*/
@@ -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
*/

@@ -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
*/
@@ -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.*;
@@ -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
*/

@@ -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
*/

@@ -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
*/
@@ -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
*/

0 comments on commit 3a6249d

Please sign in to comment.