update G1 parser to support Java 7

Author: chewiebug

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

@@ -23,6 +23,8 @@ public class DataReaderSun1_6_0G1 extends AbstractDataReaderSun {
 
     private static Logger LOG = Logger.getLogger(DataReaderSun1_6_0G1.class .getName());
 
+    private static final String TIMES = "[Times";
+    
     // the following pattern is specific for G1 with -XX:+PrintGCDetails
     // "0.295: [GC pause (young), 0.00594747 secs]"
     private static final Pattern PATTERN_GC_PAUSE = Pattern.compile("^([0-9.]+)[: \\[]{3}([A-Za-z- ()]+)[, ]+([0-9.]+)[ sec\\]]+$");
@@ -145,7 +147,7 @@ else if (line.indexOf(HEAP_SIZING_START) >= 0) {
                             lineNumber = skipHeapSizes(in, parsePosition, lineNumber, HEAP_STRINGS);
                             continue;
                         }
-                        else if (line.indexOf("Times") < 0) {
+                        else if (line.indexOf(TIMES) < 0) {
                             model.add(parseLine(line, parsePosition));
                         }
                     }
@@ -166,7 +168,7 @@ else if (beginningOfLine != null) {
                         }
 
                     }
-                    if (line.indexOf("Times") >= 0) {
+                    if (line.indexOf(TIMES) >= 0) {
                         // detailed gc description ends with " [Times: user=...]" -> finalize gcEvent
                         // otherwise just ignore 
                         if (gcEvent != null) {

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

@@ -249,4 +249,17 @@ public void testRemark() throws Exception {
         assertEquals("memory", 0, model.getFreedMemoryByGC().getMax());
     }
 
+    public void testYoungJ7() throws Exception {
+        TestLogHandler handler = new TestLogHandler();
+        IMP_LOGGER.addHandler(handler);
+        DATA_READER_FACTORY_LOGGER.addHandler(handler);
+        
+        final InputStream in = getClass().getResourceAsStream("SampleSun1_7_0G1_Young.txt");
+        final DataReader reader = new DataReaderSun1_6_0G1(in);
+        GCModel model = reader.read();
+        
+        assertEquals("gc pause", 0.00631825, model.getPause().getMax(), 0.000000001);
+        assertEquals("heap", 64*1024, model.getHeapAllocatedSizes().getMax());
+    }
+    
 }

src/test/resources/com/tagtraum/perf/gcviewer/imp/SampleSun1_7_0G1_young.txt

@@ -0,0 +1,30 @@
+0.134: [GC pause (young), 0.00631825 secs]
+   [Parallel Time:   6.2 ms]
+      [GC Worker Start Time (ms):  134.5  134.5  134.5  134.5
+       Avg: 134.5, Min: 134.5, Max: 134.5, Diff:   0.0]
+      [Update RS (ms):  0.0  0.0  0.0  0.0
+       Avg:   0.0, Min:   0.0, Max:   0.0, Diff:   0.0]
+         [Processed Buffers : 0 0 0 8
+          Sum: 8, Avg: 2, Min: 0, Max: 8, Diff: 8]
+      [Ext Root Scanning (ms):  0.6  0.6  0.6  0.4
+       Avg:   0.6, Min:   0.4, Max:   0.6, Diff:   0.3]
+      [Mark Stack Scanning (ms):  0.0  0.0  0.0  0.0
+       Avg:   0.0, Min:   0.0, Max:   0.0, Diff:   0.0]
+      [Scan RS (ms):  0.0  0.0  0.0  0.0
+       Avg:   0.0, Min:   0.0, Max:   0.0, Diff:   0.0]
+      [Object Copy (ms):  5.4  5.4  5.4  5.6
+       Avg:   5.4, Min:   5.4, Max:   5.6, Diff:   0.2]
+      [Termination (ms):  0.0  0.0  0.1  0.0
+       Avg:   0.0, Min:   0.0, Max:   0.1, Diff:   0.1]
+         [Termination Attempts : 1 1 1 1
+          Sum: 4, Avg: 1, Min: 1, Max: 1, Diff: 0]
+      [GC Worker End Time (ms):  140.6  140.6  140.6  140.7
+       Avg: 140.6, Min: 140.6, Max: 140.7, Diff:   0.0]
+      [GC Worker Times (ms):  6.1  6.1  6.1  6.1
+       Avg:   6.1, Min:   6.1, Max:   6.1, Diff:   0.0]
+      [Other:   0.1 ms]
+   [Clear CT:   0.0 ms]
+   [Other:   0.1 ms]
+      [Choose CSet:   0.0 ms]
+   [ 8192K->8128K(64M)]
+ [Times: user=0.03 sys=0.02, real=0.01 secs]