Unified Serial GC correction

parser/src/main/java/com/microsoft/gctoolkit/parser/UnifiedGenerationalParser.java

@@ -4,6 +4,7 @@
 
 import com.microsoft.gctoolkit.aggregator.EventSource;
 import com.microsoft.gctoolkit.event.CPUSummary;
+import com.microsoft.gctoolkit.event.GCCause;
 import com.microsoft.gctoolkit.event.GarbageCollectionTypes;
 import com.microsoft.gctoolkit.event.generational.AbortablePreClean;
 import com.microsoft.gctoolkit.event.generational.CMSConcurrentEvent;
@@ -21,6 +22,7 @@
 import com.microsoft.gctoolkit.event.generational.PSFullGC;
 import com.microsoft.gctoolkit.event.generational.PSYoungGen;
 import com.microsoft.gctoolkit.event.generational.ParNew;
+import com.microsoft.gctoolkit.event.generational.SystemGC;
 import com.microsoft.gctoolkit.event.generational.YoungGC;
 import com.microsoft.gctoolkit.event.jvm.JVMTermination;
 import com.microsoft.gctoolkit.jvm.Diary;
@@ -481,12 +483,21 @@ private FullGC fillOutFullGC(FullGC event, GenerationalForwardReference values)
     }
 
     private FullGC buildFullGC(GenerationalForwardReference forwardReference) {
+        FullGC gc;
         switch (forwardReference.getGarbageCollectionType()) {
             case PSFull:
-                return fillOutFullGC(new PSFullGC(forwardReference.getStartTime(), forwardReference.getGCCause(), forwardReference.getDuration()), forwardReference);
+                if ( forwardReference.getGCCause().equals(GCCause.JAVA_LANG_SYSTEM))
+                    gc = new SystemGC(forwardReference.getStartTime(), forwardReference.getGCCause(), forwardReference.getDuration());
+                else
+                    gc = new PSFullGC(forwardReference.getStartTime(), forwardReference.getGCCause(), forwardReference.getDuration());
+                return fillOutFullGC(gc, forwardReference);
             case FullGC:
             case Full:
-                return fillOutFullGC(new FullGC(forwardReference.getStartTime(), forwardReference.getGCCause(), forwardReference.getDuration()), forwardReference);
+                if ( forwardReference.getGCCause().equals(GCCause.JAVA_LANG_SYSTEM))
+                    gc = new SystemGC(forwardReference.getStartTime(), forwardReference.getGCCause(), forwardReference.getDuration());
+                else
+                    gc = new FullGC(forwardReference.getStartTime(), forwardReference.getGCCause(), forwardReference.getDuration());
+                return fillOutFullGC(gc, forwardReference);
             default:
                 LOGGER.warning(forwardReference.getGarbageCollectionType() + " is unrecognized");
         }

parser/src/test/java/com/microsoft/gctoolkit/parser/unittests/UnifiedGenerationalParserTest.java

@@ -65,4 +65,32 @@ public void testCMSLogsMissingTimeStamps() {
             //  0,   1,    2,     3,     4,     5,     6,    7,    8,     9,      10,     11,      12, 13, 14, 15, 16, 17
             {   0,   0, 6167,     0,     0,     0,     0,    0,    0,     0,       0,      2,       2,  2,  2,  2,  2,  2},
     };
+
+    //Serial
+    @Test
+    public void testSerialLogs() {
+        int i = 0;
+        for (String name : serial) {
+            try {
+                Path path = new TestLogFile("serial/" + name).getFile().toPath();
+                TestResults testResults = testGenerationalSingleLogFile(path);
+                analyzeResults(name, testResults, serialNumberOfDifferentCollectors[i], serialCounts[i++]);
+            } catch (IOException ioe) {
+                fail(ioe.getMessage());
+            }
+        }
+    }
+
+    private static final String[] serial = {
+            "factorization-serialgc-tip.log"
+    };
+
+    private static final int[] serialNumberOfDifferentCollectors = {
+            2,
+    };
+
+    private static final int[][] serialCounts = {
+            //  0,   1,    2,     3,     4,     5,     6,    7,    8,     9,      10,     11,      12, 13, 14, 15, 16, 17
+            {   0,  13,    0,     0,     0,     0,     0,    0,    0,     0,       4,      0,       0,  0,  0,  0,  0,  0},
+    };
 }