Skip to content

Commit 7d54e71

Browse files
author
Daniel D. Daugherty
committedJun 30, 2020
8246493: JDI stress/serial/mixed002 needs to use WhiteBox.deflateIdleMonitors support
Reviewed-by: cjplummer, sspitsyn
·
JEP-429-branchpoint
1 parent 7c3d72f commit 7d54e71

File tree

12 files changed

+88
-17
lines changed

12 files changed

+88
-17
lines changed
 

‎test/hotspot/jtreg/ProblemList.txt

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestD
128128
vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
129129
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
130130
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
131-
vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java 8246493 generic-all
132131

133132
vmTestbase/nsk/jdb/eval/eval001/eval001.java 8221503 generic-all
134133

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,11 @@
3737
*
3838
* @library /vmTestbase
3939
* /test/lib
40+
* @comment some of the tests from forceEarlyReturn001.tests need WhiteBox
41+
* @modules java.base/jdk.internal.misc:+open
42+
* @build sun.hotspot.WhiteBox
43+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
44+
*
4045
* @run driver jdk.test.lib.FileInstaller . .
4146
*
4247
* @comment build classes required for tests from forceEarlyReturn001.tests
@@ -64,7 +69,8 @@
6469
* -waittime=5
6570
* -debugee.vmkind=java
6671
* -transport.address=dynamic
67-
* "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
72+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
73+
* -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}"
6874
* -testClassPath ${test.class.path}
6975
* -configFile ./forceEarlyReturn001.tests
7076
*/

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
*
4040
* @library /vmTestbase
4141
* /test/lib
42+
* @comment some of the tests from forceEarlyReturn002.tests need WhiteBox
43+
* @modules java.base/jdk.internal.misc:+open
44+
* @build sun.hotspot.WhiteBox
45+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
46+
*
4247
* @run driver jdk.test.lib.FileInstaller . .
4348
*
4449
* @comment build classes required for tests from forceEarlyReturn002.tests
@@ -66,7 +71,8 @@
6671
* -waittime=5
6772
* -debugee.vmkind=java
6873
* -transport.address=dynamic
69-
* "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
74+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
75+
* -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}"
7076
* -testClassPath ${test.class.path}
7177
* -configFile ./forceEarlyReturn002.tests
7278
* -testWorkDir .

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,11 @@
3737
*
3838
* @library /vmTestbase
3939
* /test/lib
40+
* @comment some of the tests from heapwalking001.tests need WhiteBox
41+
* @modules java.base/jdk.internal.misc:+open
42+
* @build sun.hotspot.WhiteBox
43+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
44+
*
4045
* @run driver jdk.test.lib.FileInstaller . .
4146
*
4247
* @comment build classes required for tests from heapwalking001.tests
@@ -58,7 +63,8 @@
5863
* -waittime=5
5964
* -debugee.vmkind=java
6065
* -transport.address=dynamic
61-
* "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
66+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
67+
* -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}"
6268
* -testClassPath ${test.class.path}
6369
* -configFile ./heapwalking001.tests
6470
*/

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
*
4040
* @library /vmTestbase
4141
* /test/lib
42+
* @comment some of the tests from heapwalking002.tests need WhiteBox
43+
* @modules java.base/jdk.internal.misc:+open
44+
* @build sun.hotspot.WhiteBox
45+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
46+
*
4247
* @run driver jdk.test.lib.FileInstaller . .
4348
*
4449
* @comment build classes required for tests from heapwalking002.tests
@@ -60,7 +65,8 @@
6065
* -waittime=5
6166
* -debugee.vmkind=java
6267
* -transport.address=dynamic
63-
* "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
68+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
69+
* -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}"
6470
* -testClassPath ${test.class.path}
6571
* -configFile ./heapwalking002.tests
6672
* -testWorkDir .

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,11 @@
3838
*
3939
* @library /vmTestbase
4040
* /test/lib
41+
* @comment some of the tests from mixed001.tests need WhiteBox
42+
* @modules java.base/jdk.internal.misc:+open
43+
* @build sun.hotspot.WhiteBox
44+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
45+
*
4146
* @run driver jdk.test.lib.FileInstaller . .
4247
*
4348
* @comment build classes required for tests from mixed001.tests
@@ -68,7 +73,8 @@
6873
* -waittime=5
6974
* -debugee.vmkind=java
7075
* -transport.address=dynamic
71-
* "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
76+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
77+
* -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}"
7278
* -testClassPath ${test.class.path}
7379
* -configFile ./mixed001.tests
7480
*/

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
*
4141
* @library /vmTestbase
4242
* /test/lib
43+
* @comment some of the tests from mixed002.tests need WhiteBox
44+
* @modules java.base/jdk.internal.misc:+open
45+
* @build sun.hotspot.WhiteBox
46+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
47+
*
4348
* @run driver jdk.test.lib.FileInstaller . .
4449
*
4550
* @comment build classes required for tests from mixed002.tests
@@ -66,7 +71,8 @@
6671
* -waittime=5
6772
* -debugee.vmkind=java
6873
* -transport.address=dynamic
69-
* "-debugee.vmkeys=-Xmx256M ${test.vm.opts} ${test.java.opts}"
74+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
75+
* -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}"
7076
* -testClassPath ${test.class.path}
7177
* -configFile ./mixed002.tests
7278
* -testWorkDir .

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,11 @@
3838
*
3939
* @library /vmTestbase
4040
* /test/lib
41+
* @comment some of the tests from monitorEvents001.tests need WhiteBox
42+
* @modules java.base/jdk.internal.misc:+open
43+
* @build sun.hotspot.WhiteBox
44+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
45+
*
4146
* @run driver jdk.test.lib.FileInstaller . .
4247
*
4348
* @comment build classes required for tests from monitorEvents001.tests
@@ -53,7 +58,8 @@
5358
* -waittime=5
5459
* -debugee.vmkind=java
5560
* -transport.address=dynamic
56-
* "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
61+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
62+
* -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}"
5763
* -testClassPath ${test.class.path}
5864
* -configFile ./monitorEvents001.tests
5965
*/

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
*
4141
* @library /vmTestbase
4242
* /test/lib
43+
* @comment some of the tests from monitorEvents002.tests need WhiteBox
44+
* @modules java.base/jdk.internal.misc:+open
45+
* @build sun.hotspot.WhiteBox
46+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
47+
*
4348
* @run driver jdk.test.lib.FileInstaller . .
4449
*
4550
* @comment build classes required for tests from monitorEvents002.tests
@@ -55,7 +60,8 @@
5560
* -waittime=5
5661
* -debugee.vmkind=java
5762
* -transport.address=dynamic
58-
* "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
63+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
64+
* -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}"
5965
* -testClassPath ${test.class.path}
6066
* -configFile ./monitorEvents002.tests
6167
* -testWorkDir .

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,11 @@
3737
*
3838
* @library /vmTestbase
3939
* /test/lib
40+
* @comment some of the tests from ownedMonitorsAndFrames001.tests need WhiteBox
41+
* @modules java.base/jdk.internal.misc:+open
42+
* @build sun.hotspot.WhiteBox
43+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
44+
*
4045
* @run driver jdk.test.lib.FileInstaller . .
4146
*
4247
* @comment build classes required for tests from ownedMonitorsAndFrames001.tests
@@ -57,7 +62,8 @@
5762
* -waittime=5
5863
* -debugee.vmkind=java
5964
* -transport.address=dynamic
60-
* "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
65+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
66+
* -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}"
6167
* -testClassPath ${test.class.path}
6268
* -configFile ./ownedMonitorsAndFrames001.tests
6369
*/

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
*
4040
* @library /vmTestbase
4141
* /test/lib
42+
* @comment some of the tests from ownedMonitorsAndFrames002.tests need WhiteBox
43+
* @modules java.base/jdk.internal.misc:+open
44+
* @build sun.hotspot.WhiteBox
45+
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
46+
*
4247
* @run driver jdk.test.lib.FileInstaller . .
4348
*
4449
* @comment build classes required for tests from ownedMonitorsAndFrames002.tests
@@ -61,7 +66,8 @@
6166
* -waittime=5
6267
* -debugee.vmkind=java
6368
* -transport.address=dynamic
64-
* "-debugee.vmkeys=${test.vm.opts} ${test.java.opts}"
69+
* "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
70+
* -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}"
6571
* -testClassPath ${test.class.path}
6672
* -configFile ./ownedMonitorsAndFrames002.tests
6773
* -testWorkDir .

‎test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebuggee.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
2626
import java.io.StreamTokenizer;
2727
import java.io.StringReader;
2828
import nsk.share.Consts;
29+
import sun.hotspot.WhiteBox;
2930

3031
/*
3132
* This class is intended for execution several JDI tests in single VM and used together with nsk.share.jdi.SerialExecutionDebugger
@@ -41,6 +42,8 @@
4142
* For more detailed description of serial test execution see SerialExecutionDebugger
4243
*/
4344
public class SerialExecutionDebuggee extends AbstractJDIDebuggee {
45+
private final WhiteBox WB = WhiteBox.getWhiteBox();
46+
4447
public static void main(String args[]) {
4548
new SerialExecutionDebuggee().doTest(args);
4649
}
@@ -129,6 +132,15 @@ public boolean parseCommand(String command) {
129132
} else if (command.equals(COMMAND_CLEAR_DEBUGGEE)) {
130133
currentDebuggee = null;
131134

135+
// The debuggee can intentionally create inflated monitors.
136+
// With async deflation, this can pin a StateTestThread object
137+
// until the next deflation cycle. This can confuse tests run
138+
// by nsk/jdi/stress/serial/mixed002/TestDescription.java that
139+
// expect only one StateTestThread object to exist in each
140+
// of the debugger tests that mixed002 runs serially in the
141+
// same VM.
142+
WB.deflateIdleMonitors();
143+
132144
return true;
133145
}
134146

0 commit comments

Comments
 (0)
Please sign in to comment.