#204 support new phases for G1 in JDK11

Author: chewiebug

src/main/java/com/tagtraum/perf/gcviewer/model/AbstractGCEvent.java

@@ -674,6 +674,8 @@ public String toString() {
         public static final Type UJL_G1_PHASE_EVACUATE_COLLECTION_SET = new Type("Evacuate Collection Set", Generation.YOUNG, Concurrency.SERIAL, GcPattern.GC_PAUSE);
         public static final Type UJL_G1_PHASE_POST_EVACUATE_COLLECTION_SET = new Type("Post Evacuate Collection Set", Generation.YOUNG, Concurrency.SERIAL, GcPattern.GC_PAUSE);
         public static final Type UJL_G1_PHASE_OTHER = new Type("Other", Generation.YOUNG, Concurrency.SERIAL, GcPattern.GC_PAUSE);
+        public static final Type UJL_G1_PHASE_PREPARE_FOR_COMPACTION = new Type("Phase 2: Prepare for compaction", Generation.YOUNG, Concurrency.SERIAL, GcPattern.GC_PAUSE);
+        public static final Type UJL_G1_PHASE_COMPACT_HEAP = new Type("Phase 4: Compact heap", Generation.YOUNG, Concurrency.SERIAL, GcPattern.GC_PAUSE);
 
         // unified jvm logging shenandoah event types
         public static final Type UJL_SHEN_INIT_MARK = new Type("Pause Init Mark", Generation.TENURED, Concurrency.SERIAL, GcPattern.GC_PAUSE);

src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1.java

@@ -221,7 +221,7 @@ public void testParseGcWithPhases() throws Exception  {
 
         assertThat("number of warnings", handler.getCount(), is(0));
         assertThat("number of events", model.size(), is(1));
-        assertThat("event type", model.get(0).getExtendedType().getType(), is(Type.UJL_PAUSE_YOUNG));
+        assertThat("event type", model.get(0).getExtendedType().getType(), is(Type.UJL_G1_PAUSE_YOUNG));
         assertThat("event pause", model.get(0).getPause(), closeTo(0.007033, 0.0000001));
 
         assertThat("phases", model.getGcEventPhases().size(), is(4));

src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJL11G1.java renamed to src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK11.java

@@ -19,7 +19,7 @@
 /**
  * Test unified java logging G1 algorithm in OpenJDK 11
  */
-public class TestDataReaderUJL11G1 {
+public class TestDataReaderUJLG1JDK11 {
     private GCModel getGCModelFromLogFile(String fileName) throws IOException {
         return UnittestHelper.getGCModelFromLogFile(fileName, FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class);
     }
@@ -96,4 +96,42 @@ public void testDefaultsPauseYoungMixed() throws Exception {
         assertThat("total heap", model.get(0).getTotal(), is(128 * 1024));
     }
 
+    @Test
+    public void testFullGcWithPhases() throws Exception {
+        TestLogHandler handler = new TestLogHandler();
+        handler.setLevel(Level.WARNING);
+        GCResource gcResource = new GcResourceFile("byteArray");
+        gcResource.getLogger().addHandler(handler);
+        InputStream in = new ByteArrayInputStream(
+                ("[1.204s][info][gc,task      ] GC(15) Using 3 workers of 4 for full compaction\n" +
+                    "[1.204s][info][gc,start     ] GC(15) Pause Full (G1 Evacuation Pause)\n" +
+                    "[1.204s][info][gc,phases,start] GC(15) Phase 1: Mark live objects\n" +
+                    "[1.207s][info][gc,stringtable ] GC(15) Cleaned string and symbol table, strings: 7381 processed, 70 removed, symbols: 49128 processed, 10 removed\n" +
+                    "[1.207s][info][gc,phases      ] GC(15) Phase 1: Mark live objects 3.036ms\n" +
+                    "[1.207s][info][gc,phases,start] GC(15) Phase 2: Prepare for compaction\n" +
+                    "[1.208s][info][gc,phases      ] GC(15) Phase 2: Prepare for compaction 0.808ms\n" +
+                    "[1.208s][info][gc,phases,start] GC(15) Phase 3: Adjust pointers\n" +
+                    "[1.210s][info][gc,phases      ] GC(15) Phase 3: Adjust pointers 1.916ms\n" +
+                    "[1.210s][info][gc,phases,start] GC(15) Phase 4: Compact heap\n" +
+                    "[1.223s][info][gc,phases      ] GC(15) Phase 4: Compact heap 13.268ms\n" +
+                    "[1.224s][info][gc,heap        ] GC(15) Eden regions: 0->0(17)\n" +
+                    "[1.224s][info][gc,heap        ] GC(15) Survivor regions: 0->0(1)\n" +
+                    "[1.224s][info][gc,heap        ] GC(15) Old regions: 128->62\n" +
+                    "[1.224s][info][gc,heap        ] GC(15) Humongous regions: 0->0\n" +
+                    "[1.224s][info][gc,metaspace   ] GC(15) Metaspace: 15025K->15025K(1062912K)\n" +
+                    "[1.224s][info][gc             ] GC(15) Pause Full (G1 Evacuation Pause) 127M->59M(128M) 20.596ms\n" +
+                    "[1.225s][info][gc,cpu         ] GC(15) User=0.05s Sys=0.00s Real=0.02s\n" +
+                    "[1.225s][info][safepoint      ] Leaving safepoint region\n" +
+                    "[1.225s][info][safepoint      ] Total time for which application threads were stopped: 0.0222150 seconds, Stopping threads took: 0.0000452 seconds\n")
+                .getBytes());
+
+        DataReader reader = new DataReaderUnifiedJvmLogging(gcResource, in);
+        GCModel model = reader.read();
+
+        assertThat("number of warnings", handler.getCount(), is(0));
+        assertThat("number of events", model.size(), is(1));
+        assertThat("total heap", model.get(0).getTotal(), is(128 * 1024));
+
+    }
+
 }