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

8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests

Browse Source 
Reviewed-by: dholmes, lmesnik, kevinw, sspitsyn
This commit is contained in:
Alex Menkov 2022-11-30 18:39:24 +00:00
parent 1323e98df1
commit 53dd214318
7 changed files with 64 additions and 248 deletions
test/hotspot/jtreg
TEST.quick-groups
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount
reset001.java
reset001
TestDescription.java
reset002
TestDescription.java
reset003
TestDescription.java
reset004
TestDescription.java
reset005
TestDescription.java

6
test/hotspot/jtreg/TEST.quick-groups

@ -126,11 +126,7 @@ vmTestbase_nsk_monitoring_quick = \
vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime003/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime004/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/isThreadCpuTimeSupported/thcputime005/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset002/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset003/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset004/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset005/TestDescription.java \
vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001.java \
vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel001/TestDescription.java \
vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel002/TestDescription.java \
vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel003/TestDescription.java \

65
test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2022, 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,6 +21,67 @@
* questions.
*/
/*
* @test
*
* @summary converted from VM Testbase nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001..reset005
* VM Testbase keywords: [quick, monitoring]
* VM Testbase readme:
* DESCRIPTION
* The test checks that
* ThreadMXBean.resetPeakThreadCount()
* returns correct result.
* The test starts a couple of user threads and waits until they finish. After
* that, resetPeakThreadCount() is invoked to reset the peak. Then
* getPeakThreadCount() and getThreadCount() must return the same values. The
* expectation is that no threads are created, or terminated, between
* "getPeakThreadCount()" and getThreadCount()" calls.
* The test implements defferent ways to access to the metrics.
*
* @comment Direct access to the metrics.
* @library /vmTestbase
* /test/lib
* @run main/othervm nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001
*/
/*
* @test
* @comment Access to the metrics via default MBean server.
* @library /vmTestbase
* /test/lib
* @run main/othervm nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001 -testMode=server
*/
/*
* @test
* @comment Access to the metrics via custom MBean server.
* @library /vmTestbase
* /test/lib
* @run main/othervm
* nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001
* -testMode=server
* -MBeanServer=custom
*/
/*
* @test
* @comment Access to the metrics via default MBean server proxy.
* @library /vmTestbase
* /test/lib
* @run main/othervm nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001 -testMode=proxy
*/
/*
* @test
* @comment Access to the metrics via custom MBean server proxy.
* @library /vmTestbase
* /test/lib
* @run main/othervm
* nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001
* -testMode=proxy
* -MBeanServer=custom
*/
package nsk.monitoring.ThreadMXBean.resetPeakThreadCount;
import java.io.*;
@ -54,7 +115,7 @@ public class reset001 {
testFailed = true;
}
// The test supposes that no threads are appered/disappeared between
// The test assumes that no threads are created or terminated between
// "getPeakThreadCount()" and "getThreadCount()" calls
monitor.resetPeakThreadCount();
int peak = monitor.getPeakThreadCount();

47
test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001/TestDescription.java

@ -1,47 +0,0 @@
/*
* 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
* 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 converted from VM Testbase nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset001.
* VM Testbase keywords: [quick, monitoring]
* VM Testbase readme:
* DESCRIPTION
* The test checks that
* ThreadMXBean.resetPeakThreadCount()
* returns correct result.
* The test starts a couple of user threads and waits until they finish. After
* that, resetPeakThreadCount() is invoked to reset the peak. Then
* getPeakThreadCount() and getThreadCount() must return the same values. The
* preposition is that no threads are appered/disappeared between
* "getPeakThreadCount()" and getThreadCount()" calls.
* The test implements direct access to the metrics.
* COMMENT
*
* @library /vmTestbase
* /test/lib
* @run main/othervm nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001
*/

47
test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset002/TestDescription.java

@ -1,47 +0,0 @@
/*
* 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
* 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 converted from VM Testbase nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset002.
* VM Testbase keywords: [quick, monitoring]
* VM Testbase readme:
* DESCRIPTION
* The test checks that
* ThreadMXBean.resetPeakThreadCount()
* returns correct result.
* The test starts a couple of user threads and waits until they finish. After
* that, resetPeakThreadCount() is invoked to reset the peak. Then
* getPeakThreadCount() and getThreadCount() must return the same values. The
* preposition is that no threads are appered/disappeared between
* "getPeakThreadCount()" and getThreadCount()" calls.
* The test implements access to the metrics via default MBean server.
* COMMENT
*
* @library /vmTestbase
* /test/lib
* @run main/othervm nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001 -testMode=server
*/

50
test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset003/TestDescription.java

@ -1,50 +0,0 @@
/*
* 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
* 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 converted from VM Testbase nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset003.
* VM Testbase keywords: [quick, monitoring]
* VM Testbase readme:
* DESCRIPTION
* The test checks that
* ThreadMXBean.resetPeakThreadCount()
* returns correct result.
* The test starts a couple of user threads and waits until they finish. After
* that, resetPeakThreadCount() is invoked to reset the peak. Then
* getPeakThreadCount() and getThreadCount() must return the same values. The
* preposition is that no threads are appered/disappeared between
* "getPeakThreadCount()" and getThreadCount()" calls.
* The test implements access to the metrics via custom MBean server.
* COMMENT
*
* @library /vmTestbase
* /test/lib
* @run main/othervm
* nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001
* -testMode=server
* -MBeanServer=custom
*/

47
test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset004/TestDescription.java

@ -1,47 +0,0 @@
/*
* 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
* 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 converted from VM Testbase nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset004.
* VM Testbase keywords: [quick, monitoring]
* VM Testbase readme:
* DESCRIPTION
* The test checks that
* ThreadMXBean.resetPeakThreadCount()
* returns correct result.
* The test starts a couple of user threads and waits until they finish. After
* that, resetPeakThreadCount() is invoked to reset the peak. Then
* getPeakThreadCount() and getThreadCount() must return the same values. The
* preposition is that no threads are appered/disappeared between
* "getPeakThreadCount()" and getThreadCount()" calls.
* The test implements access to the metrics via default MBean server proxy.
* COMMENT
*
* @library /vmTestbase
* /test/lib
* @run main/othervm nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001 -testMode=proxy
*/

50
test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset005/TestDescription.java

@ -1,50 +0,0 @@
/*
* 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
* 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 converted from VM Testbase nsk/monitoring/ThreadMXBean/resetPeakThreadCount/reset005.
* VM Testbase keywords: [quick, monitoring]
* VM Testbase readme:
* DESCRIPTION
* The test checks that
* ThreadMXBean.resetPeakThreadCount()
* returns correct result.
* The test starts a couple of user threads and waits until they finish. After
* that, resetPeakThreadCount() is invoked to reset the peak. Then
* getPeakThreadCount() and getThreadCount() must return the same values. The
* preposition is that no threads are appered/disappeared between
* "getPeakThreadCount()" and getThreadCount()" calls.
* The test implements access to the metrics via custom MBean server proxy.
* COMMENT
*
* @library /vmTestbase
* /test/lib
* @run main/othervm
* nsk.monitoring.ThreadMXBean.resetPeakThreadCount.reset001
* -testMode=proxy
* -MBeanServer=custom
*/