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

8202360: [TESTBUG] runtime/LoadClass/TestResize.java needs to print output when it fails

Browse Source 
Print out output from PrintSystemDictionaryAtExit at failure

Reviewed-by: mseledtsov, dholmes
This commit is contained in:
Gerard Ziemski 2018-05-31 09:51:31 -05:00
parent d5bb71b01e
commit 41259aae4d
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
test/hotspot/jtreg/runtime/LoadClass/TestResize.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@
*/ */
import jdk.test.lib.Platform; import jdk.test.lib.Platform;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.ProcessTools;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -66,42 +67,61 @@ public class TestResize {
} }
static void analyzeOutputOn(ProcessBuilder pb) throws Exception { static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
pb.redirectErrorStream(true); OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
Process process = pb.start(); String output = analyzer.getStdout();
BufferedReader rd = new BufferedReader(new InputStreamReader(process.getInputStream())); analyzer.shouldHaveExitValue(0);
String line = rd.readLine();
while (line != null) { boolean resized = false;
if (line.startsWith("Java dictionary (")) {
// ex. "Java dictionary (table_size=107, classes=6)" // Split string into lines using platform independent end of line marker.
// ex. "Java dictionary (table_size=20201, classes=50002)" String[] lines = output.split("\\R");
for (String line : lines) {
if (!resized) {
// ex. [0.563s][info][safepoint,cleanup] resizing system dictionaries, 0.0000002 secs
if (line.contains("resizing system dictionaries")) {
resized = true;
}
} else if (resized && line.startsWith("Java dictionary (")) {
// ex. Java dictionary (table_size=10103, classes=5002)
Scanner scanner = new Scanner(line); Scanner scanner = new Scanner(line);
scanner.next(); scanner.next(); // skip "Java"
scanner.next(); scanner.next(); // skip "dictionary"
int table_size = getInt(scanner.next()); int table_size = getInt(scanner.next()); // process "(table_size=40423"
int classes = getInt(scanner.next()); int classes = getInt(scanner.next()); // process ", classes=50002"
scanner.close(); scanner.close();
double loadFactor = (double)classes / (double)table_size; double loadFactor = (double)classes / (double)table_size;
if (loadFactor > MAX_LOAD_FACTOR) { if (loadFactor > MAX_LOAD_FACTOR) {
throw new RuntimeException("Load factor too high, expected MAX "+MAX_LOAD_FACTOR+", got "+loadFactor);
// We've hit an error, so print all of the output.
System.out.println(output);
throw new RuntimeException("Load factor too high, expected MAX " + MAX_LOAD_FACTOR +
", got " + loadFactor + " [table size " + table_size + ", number of clases " + classes + "]");
} else { } else {
System.out.println("PASS table_size:"+table_size+", classes:"+classes+" OK"); System.out.println("PASS table_size: " + table_size + ", classes: " + classes +
", load factor: " + loadFactor + " <= " + MAX_LOAD_FACTOR);
// There are more than one system dictionary to check, so keep looking...
} }
} }
line = rd.readLine();
} }
int retval = process.waitFor();
if (retval != 0) { if (!resized) {
throw new RuntimeException("Error: test returned non-zero value"); System.out.println("PASS trivially. No resizing occurred, so did not check the load.");
} }
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
if (Platform.isDebugBuild()) { if (Platform.isDebugBuild()) {
// -XX:+PrintSystemDictionaryAtExit will print the details of system dictionary,
// that will allow us to calculate the table's load factor.
// -Xlog:safepoint+cleanup will print out cleanup details at safepoint
// that will allow us to detect if the system dictionary resized.
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintSystemDictionaryAtExit", ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintSystemDictionaryAtExit",
"-Xlog:safepoint+cleanup",
"TriggerResize", "TriggerResize",
"50000"); "50000");
analyzeOutputOn(pb); analyzeOutputOn(pb);
} }
} }
} }