fix calculation of initiatingOccupancyFraction for G1 algorithm

Author: chewiebug

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

@@ -229,12 +229,7 @@ public boolean isConcurrentCollectionEnd() {
     }
 
     public boolean isInitialMark() {
-        return getTypeAsString().indexOf(Type.CMS_INITIAL_MARK.getName()) >= 0
-                || getTypeAsString().indexOf(Type.ASCMS_INITIAL_MARK.getName()) >= 0
-                || getTypeAsString().indexOf(Type.G1_YOUNG_INITIAL_MARK.getName()) >= 0
-                || getTypeAsString().indexOf(Type.G1_YOUNG_INITIAL_MARK_TO_SPACE_OVERFLOW.getName()) >= 0
-                || getTypeAsString().indexOf(Type.G1_PARTIAL_INITIAL_MARK.getName()) >= 0
-                || getTypeAsString().indexOf(Type.G1_PARTIAL_INITIAL_MARK_TO_SPACE_OVERFLOW.getName()) >= 0;
+        return getTypeAsString().indexOf("initial-mark") >= 0;
     }
 
     public boolean isRemark() {

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

@@ -553,17 +553,15 @@ private void updateGcPauseInterval(GCEvent event) {
     }
 
     private void updateInitiatingOccupancyFraction(GCEvent event) {
-        GCEvent initialMarkEvent = null;
+        GCEvent initialMarkEvent = event;
 
-        if (!event.hasDetails() && event.isInitialMark()) {
-            initialMarkEvent = event;
-        }
-        else {
+        if (event.hasDetails()) {
             Iterator<GCEvent> i = event.details();
-            while (i.hasNext() && initialMarkEvent == null) {
+            while (i.hasNext()) {
                 GCEvent gcEvent = i.next();
                 if (gcEvent.isInitialMark()) {
                     initialMarkEvent = gcEvent;
+                    break;
                 }
             }
         }

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

@@ -1,5 +1,6 @@
 package com.tagtraum.perf.gcviewer.imp;
 
+import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -46,6 +47,8 @@ public void fullConcurrentCycle() throws Exception {
         assertThat("tenured size after concurrent cycle", model.getPostConcurrentCycleTenuredUsedSizes().getMax(), is(31949 - 10*1024 - 3072));
         assertThat("heap size after concurrent cycle", model.getPostConcurrentCycleHeapUsedSizes().getMax(), is(31949));
 
+        assertThat("initiatingOccupancyFraction", model.getCmsInitiatingOccupancyFraction().getMax(), closeTo(0.69, 0.001));
+        
         assertThat("number of errors", handler.getCount(), is(0));
     }