equal
deleted
inserted
replaced
119 private static String subphaseRegex(String subphaseName, boolean parallelRefProcEnabled) { |
119 private static String subphaseRegex(String subphaseName, boolean parallelRefProcEnabled) { |
120 final String timeRegex = "\\s+" + doubleRegex; |
120 final String timeRegex = "\\s+" + doubleRegex; |
121 if (parallelRefProcEnabled) { |
121 if (parallelRefProcEnabled) { |
122 final String timeInParRegex = timeRegex +",\\s"; |
122 final String timeInParRegex = timeRegex +",\\s"; |
123 return gcLogTimeRegex + indent(8) + subphaseName + |
123 return gcLogTimeRegex + indent(8) + subphaseName + |
124 " \\(ms\\):\\s+Min: " + timeInParRegex + "Avg: " + timeInParRegex + "Max: " + timeInParRegex + "Diff: " + timeInParRegex + "Sum: " + timeInParRegex + |
124 " \\(ms\\):\\s+(Min:" + timeInParRegex + "Avg:" + timeInParRegex + "Max:" + timeInParRegex + "Diff:" + timeInParRegex + "Sum:" + timeInParRegex + |
125 "Workers: [0-9]+" + "\n"; |
125 "Workers: [0-9]+|skipped)" + "\n"; |
126 } else { |
126 } else { |
127 return gcLogTimeRegex + indent(8) + subphaseName + ":" + timeRegex + "ms\n"; |
127 return gcLogTimeRegex + indent(8) + subphaseName + ":(" + timeRegex + "ms|\\s+skipped)\n"; |
128 } |
128 } |
129 } |
129 } |
130 |
130 |
131 // Find the first Reference Processing log and check its format. |
131 // Find the first Reference Processing log and check its format. |
132 private static void checkLogFormat(OutputAnalyzer output, boolean parallelRefProcEnabled) { |
132 private static void checkLogFormat(OutputAnalyzer output, boolean parallelRefProcEnabled) { |
134 String timeRegex = doubleRegex + "ms"; |
134 String timeRegex = doubleRegex + "ms"; |
135 |
135 |
136 /* Total Reference processing time */ |
136 /* Total Reference processing time */ |
137 String totalRegex = gcLogTimeRegex + indent(4) + referenceProcessing + ": " + timeRegex + "\n"; |
137 String totalRegex = gcLogTimeRegex + indent(4) + referenceProcessing + ": " + timeRegex + "\n"; |
138 |
138 |
139 String balanceRegex = parallelRefProcEnabled ? gcLogTimeRegex + indent(8) + "Balance queues: " + timeRegex + "\n" : ""; |
139 String balanceRegex = parallelRefProcEnabled ? "(" + gcLogTimeRegex + indent(8) + "Balance queues: " + timeRegex + "\n)??" : ""; |
140 |
140 |
141 final boolean p = parallelRefProcEnabled; |
141 final boolean p = parallelRefProcEnabled; |
142 |
142 |
143 String phase1Regex = gcLogTimeRegex + phaseRegex(phaseReconsiderSoftReferences) + balanceRegex + subphaseRegex("SoftRef", p); |
143 String phase1Regex = gcLogTimeRegex + phaseRegex(phaseReconsiderSoftReferences) + balanceRegex + subphaseRegex("SoftRef", p); |
144 String phase2Regex = gcLogTimeRegex + phaseRegex(phaseNotifySoftWeakReferences) + |
144 String phase2Regex = gcLogTimeRegex + phaseRegex(phaseNotifySoftWeakReferences) + |