< prev index next > test/hotspot/jtreg/gc/g1/plab/lib/LogParser.java
8217385: JTREG: Clean up, make sure to close resources
public PlabReport getEntries() {
return report;
}
private PlabReport parseLines() throws NumberFormatException {
- Scanner lineScanner = new Scanner(log);
- PlabReport plabReport = new PlabReport();
- Optional<Long> gc_id;
- while (lineScanner.hasNextLine()) {
- String line = lineScanner.nextLine();
- gc_id = getGcId(line, GC_ID_PATTERN);
- if (gc_id.isPresent()) {
- Matcher matcher = PAIRS_PATTERN.matcher(line);
- if (matcher.find()) {
- if (!plabReport.containsKey(gc_id.get())) {
- plabReport.put(gc_id.get(), new PlabGCStatistics());
- }
- ReportType reportType = line.contains("Young") ? ReportType.SURVIVOR_STATS : ReportType.OLD_STATS;
+ try (Scanner lineScanner = new Scanner(log)) {
+ PlabReport plabReport = new PlabReport();
+ Optional<Long> gc_id;
+ while (lineScanner.hasNextLine()) {
+ String line = lineScanner.nextLine();
+ gc_id = getGcId(line, GC_ID_PATTERN);
+ if (gc_id.isPresent()) {
+ Matcher matcher = PAIRS_PATTERN.matcher(line);
+ if (matcher.find()) {
+ if (!plabReport.containsKey(gc_id.get())) {
+ plabReport.put(gc_id.get(), new PlabGCStatistics());
+ }
+ ReportType reportType = line.contains("Young") ? ReportType.SURVIVOR_STATS : ReportType.OLD_STATS;
- PlabGCStatistics gcStat = plabReport.get(gc_id.get());
- if (!gcStat.containsKey(reportType)) {
- gcStat.put(reportType, new PlabInfo());
- }
+ PlabGCStatistics gcStat = plabReport.get(gc_id.get());
+ if (!gcStat.containsKey(reportType)) {
+ gcStat.put(reportType, new PlabInfo());
+ }
- // Extract all pairs from log.
- PlabInfo plabInfo = gcStat.get(reportType);
- do {
- String pair = matcher.group();
- String[] nameValue = pair.replaceAll(": ", ":").split(":");
- plabInfo.put(nameValue[0].trim(), Long.parseLong(nameValue[1]));
- } while (matcher.find());
+ // Extract all pairs from log.
+ PlabInfo plabInfo = gcStat.get(reportType);
+ do {
+ String pair = matcher.group();
+ String[] nameValue = pair.replaceAll(": ", ":").split(":");
+ plabInfo.put(nameValue[0].trim(), Long.parseLong(nameValue[1]));
+ } while (matcher.find());
+ }
}
}
+ return plabReport;
}
- return plabReport;
}
private static Optional<Long> getGcId(String line, Pattern pattern) {
Matcher number = pattern.matcher(line);
if (number.find()) {
< prev index next >