Skip to content

Commit e76f8a7

Browse files
author
cuiweilong
committed
add "[gc,init" to LOG_ONLY_STRINGS
1 parent d54eae8 commit e76f8a7

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderSun1_6_0.java

+1
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ public DataReaderSun1_6_0(GCResource gcResource, InputStream in, GcLogType gcLog
273273

274274
public GCModel read() throws IOException {
275275
if (getLogger().isLoggable(Level.INFO)) getLogger().info("Reading Sun / Oracle 1.4.x / 1.5.x / 1.6.x / 1.7.x / 1.8.x format...");
276+
276277
try (LineNumberReader in = this.in) {
277278
GCModel model = new GCModel();
278279
model.setFormat(GCModel.Format.SUN_X_LOG_GC);

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderTools.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public ExtendedType parseType(String typeString) throws UnknownGcTypeException {
6969
}
7070

7171
/**
72-
* Same as @{link {@link #parseType(String)}}, but returns <code>null</code> instead of exception, if no type could
72+
* Same as {@link #parseType(String)}, but returns <code>null</code> instead of exception, if no type could
7373
* be found.
7474
*
7575
* @param typeName string representation of the gc event

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderUnifiedJvmLogging.java

+19-15
Original file line numberDiff line numberDiff line change
@@ -90,22 +90,24 @@ public class DataReaderUnifiedJvmLogging extends AbstractDataReader {
9090
private static final int GROUP_PAUSE = 1;
9191

9292
// Input: 4848M->4855M(4998M)
93-
// Group 1: 4848
94-
// Group 2: M
95-
// Group 3: 4855
96-
// Group 4: M
97-
// Group 5: 4998
98-
// Group 6: M
93+
// Group 1: 4848M->4855M(4998M)
94+
// Group 2: 4848
95+
// Group 3: M
96+
// Group 4: 4855
97+
// Group 5: M
98+
// Group 6: 4998
99+
// Group 7: M
99100
private static final Pattern PATTERN_MEMORY = Pattern.compile("^" + PATTERN_MEMORY_STRING);
100101

101102
// Input: 4848M->4855M(4998M) 2.872ms
102-
// Group 1: 4848
103-
// Group 2: M
104-
// Group 3: 4855
105-
// Group 4: M
106-
// Group 5: 4998
107-
// Group 6: M
108-
// Group 7: 2.872 (optional group)
103+
// Group 1: 4848M->4855M(4998M)
104+
// Group 2: 4848
105+
// Group 3: M
106+
// Group 4: 4855
107+
// Group 5: M
108+
// Group 6: 4998
109+
// Group 7: M
110+
// Group 8: 2.872 (optional group)
109111
private static final Pattern PATTERN_MEMORY_PAUSE = Pattern.compile("^" + PATTERN_MEMORY_STRING + "(?:(?:[ ]" + PATTERN_PAUSE_STRING + ")|$)");
110112

111113
private static final int GROUP_MEMORY = 1;
@@ -161,10 +163,11 @@ public class DataReaderUnifiedJvmLogging extends AbstractDataReader {
161163
private static final String TAG_GC_HEAP = "gc,heap";
162164
private static final String TAG_GC_METASPACE = "gc,metaspace";
163165
private static final String TAG_GC_PHASES = "gc,phases";
166+
private static final String TAG_GC_INIT = "gc,init";
164167
private static final String TAG_SAFEPOINT = "safepoint";
165168

166169
/** list of strings, that must be part of the gc log line to be considered for parsing */
167-
private static final List<String> INCLUDE_STRINGS = Arrays.asList("[gc ", "[gc]", "[" + TAG_GC_START, "[" + TAG_GC_HEAP, "[" + TAG_GC_METASPACE, "[" + TAG_GC_PHASES, Type.APPLICATION_STOPPED_TIME.getName(), "Heap Region Size");
170+
private static final List<String> INCLUDE_STRINGS = Arrays.asList("[gc ", "[gc]", "[" + TAG_GC_START, "[" + TAG_GC_HEAP, "[" + TAG_GC_METASPACE, "[" + TAG_GC_PHASES, "[" + TAG_GC_INIT, Type.APPLICATION_STOPPED_TIME.getName());
168171
/** list of strings, that target gc log lines, that - although part of INCLUDE_STRINGS - are not considered a gc event */
169172
private static final List<String> EXCLUDE_STRINGS = Arrays.asList("Cancelling concurrent GC",
170173
"[debug",
@@ -198,7 +201,8 @@ public class DataReaderUnifiedJvmLogging extends AbstractDataReader {
198201
"Heap Region Size", // jdk 17
199202
"Consider",
200203
"Heuristics ergonomically sets",
201-
"Soft Max Heap Size" // ShenandoahGC
204+
"Soft Max Heap Size", // ShenandoahGC
205+
"[gc,init"
202206
);
203207

204208
protected DataReaderUnifiedJvmLogging(GCResource gcResource, InputStream in) throws UnsupportedEncodingException {

0 commit comments

Comments
 (0)