archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8217337: [TESTBUG] TestThreadDumpClassInitMonitor.java fails with Unexpected thread info line

Browse source 
Product build is missing two lines in the stacktrace

Reviewed-by: clanger, iignatyev
This commit is contained in:
David Holmes 2019-01-18 18:21:50 -05:00
parent 5622c425c1
commit 8859f7ec1e
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java
View file

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8213397 * @bug 8213397 8217337
* @summary Check that the thread dump shows when a thread is blocked * @summary Check that the thread dump shows when a thread is blocked
* on a class initialization monitor * on a class initialization monitor
* *
@ -33,6 +33,7 @@
import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.JDKToolFinder; import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.Platform;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@ -51,8 +52,8 @@ public class TestThreadDumpClassInitMonitor {
* *
* "TestThread" #22 prio=5 os_prio=0 cpu=1.19ms elapsed=0.80s tid=0x00007f8f9405d800 nid=0x568b in Object.wait() [0x00007f8fd94d0000] * "TestThread" #22 prio=5 os_prio=0 cpu=1.19ms elapsed=0.80s tid=0x00007f8f9405d800 nid=0x568b in Object.wait() [0x00007f8fd94d0000]
* java.lang.Thread.State: RUNNABLE * java.lang.Thread.State: RUNNABLE
* Thread: 0x00007f8f9405d800 [0x568b] State: _at_safepoint _has_called_back 0 _at_poll_safepoint 0 * Thread: 0x00007f8f9405d800 [0x568b] State: _at_safepoint _has_called_back 0 _at_poll_safepoint 0 // DEBUG ONLY
* JavaThread state: _thread_blocked * JavaThread state: _thread_blocked // DEBUG ONLY
* at TestThreadDumpClassInitMonitor$Target$1.run(TestThreadDumpClassInitMonitor.java:69) * at TestThreadDumpClassInitMonitor$Target$1.run(TestThreadDumpClassInitMonitor.java:69)
* - waiting on the Class initialization monitor for TestThreadDumpClassInitMonitor$Target * - waiting on the Class initialization monitor for TestThreadDumpClassInitMonitor$Target
* *
@ -128,6 +129,8 @@ public class TestThreadDumpClassInitMonitor {
// Now check the output of jstack // Now check the output of jstack
try { try {
// product builds miss 2 lines of information in the stack
boolean isProduct = !Platform.isDebugBuild();
int foundLines = 0; int foundLines = 0;
parseStack: for (String line : stackDump) { parseStack: for (String line : stackDump) {
switch(foundLines) { switch(foundLines) {
@ -145,17 +148,21 @@ public class TestThreadDumpClassInitMonitor {
if (!line.trim().equals(THREAD_STATE)) { if (!line.trim().equals(THREAD_STATE)) {
throw new Error("Unexpected thread state line: " + line); throw new Error("Unexpected thread state line: " + line);
} }
foundLines++; if (isProduct) {
foundLines += 3;
} else {
foundLines++;
}
continue; continue;
} }
case 2: { case 2: { // Debug build
if (!line.startsWith(THREAD_INFO)) { if (!line.startsWith(THREAD_INFO)) {
throw new Error("Unexpected thread info line: " + line); throw new Error("Unexpected thread info line: " + line);
} }
foundLines++; foundLines++;
continue; continue;
} }
case 3: { case 3: { // Debug build
if (!line.trim().equals(JAVATHREAD_STATE)) { if (!line.trim().equals(JAVATHREAD_STATE)) {
throw new Error("Unexpected JavaThread state line: " + line); throw new Error("Unexpected JavaThread state line: " + line);
} }