#198 improve rendering for Shenandoah algorithm (only concurrent events have memory information)

chewiebug · chewiebug · commit 27cef98cac7c · 2019-10-11T16:04:36.000+02:00
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/ConcurrentGcBegionEndRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/ConcurrentGcBegionEndRenderer.java
@@ -37,7 +37,7 @@ public void paintComponent(Graphics2D g2d) {
         for (Iterator<ConcurrentGCEvent> i = getModelChart().getModel().getConcurrentGCEvents(); i.hasNext();) {
             final ConcurrentGCEvent event = i.next();
             if (event.isConcurrentCollectionStart()) {
-                final int scaledTimestamp = (int) (scaleFactor * (event.getTimestamp() - getModelChart().getModel().getFirstPauseTimeStamp()));
+                final int scaledTimestamp = (int) (scaleFactor * (event.getTimestamp() - getModelChart().getModel().getFirstPauseTimeStamp() - event.getPause()));
                 if (scaledTimestamp != lastScaledTimestampBegin) {
                     g2d.setPaint(CONCURRENT_COLLECTION_BEGIN);
                     g2d.drawLine(scaledTimestamp, 0, scaledTimestamp, height);
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/FullGCLineRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/FullGCLineRenderer.java
@@ -1,12 +1,16 @@
 package com.tagtraum.perf.gcviewer.view.renderer;
 
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.util.Iterator;
+
 import com.tagtraum.perf.gcviewer.model.GCEvent;
 import com.tagtraum.perf.gcviewer.view.ChartRenderer;
 import com.tagtraum.perf.gcviewer.view.ModelChartImpl;
 
-import java.awt.*;
-import java.util.Iterator;
-
 /**
  * FullGCLineRenderer.
  *
@@ -34,7 +38,7 @@ public void paintComponent(Graphics2D g2d) {
         int lastScaledTimestamp = Integer.MIN_VALUE;
         for (Iterator<GCEvent> i = getModelChart().getModel().getFullGCEvents(); i.hasNext();) {
             GCEvent event = i.next();
-            int scaledTimestamp = (int)(scaleFactor * (event.getTimestamp() - getModelChart().getModel().getFirstPauseTimeStamp()));
+            int scaledTimestamp = (int)(scaleFactor * (event.getTimestamp() - getModelChart().getModel().getFirstPauseTimeStamp() - event.getPause()));
             if (scaledTimestamp != lastScaledTimestamp && scaledTimestamp >= minX && scaledTimestamp <= maxX) {
                 g2d.drawLine(scaledTimestamp, 0, scaledTimestamp, height);
                 lastScaledTimestamp = scaledTimestamp;
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/GCRectanglesRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/GCRectanglesRenderer.java
@@ -8,9 +8,9 @@
 import java.util.Iterator;
 
 import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
+import com.tagtraum.perf.gcviewer.model.VmOperationEvent;
 import com.tagtraum.perf.gcviewer.view.ChartRenderer;
 import com.tagtraum.perf.gcviewer.view.ModelChartImpl;
-import com.tagtraum.perf.gcviewer.model.VmOperationEvent;
 
 /**
  * Renders all stop the world event pauses as rectangles.
@@ -56,7 +56,7 @@ public void paintComponent(Graphics2D g2d) {
             double pause = event.getPause();
             int width = (int) Math.max(Math.abs(scaleFactor * pause), 1.0d);
             int height = (int) (pause * scaledHeight);
-            int x = (int) (scaleFactor * (event.getTimestamp() - getModelChart().getModel().getFirstPauseTimeStamp()));
+            int x = (int) (scaleFactor * (event.getTimestamp() - getModelChart().getModel().getFirstPauseTimeStamp() - event.getPause()));
             int y = getHeight() - (int) (pause * scaledHeight);
             if (lastX != x || lastY != y || lastWidth != width || lastHeight != height) {
                 if ((x + width) > leftBoundary && x < rightBoundary) {
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/TotalHeapRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/TotalHeapRenderer.java
@@ -7,7 +7,6 @@
 import java.util.Iterator;
 
 import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
-import com.tagtraum.perf.gcviewer.model.GCEvent;
 import com.tagtraum.perf.gcviewer.model.GCModel;
 import com.tagtraum.perf.gcviewer.view.ModelChart;
 import com.tagtraum.perf.gcviewer.view.ModelChartImpl;
@@ -35,22 +34,19 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {
         ScaledPolygon polygon = createMemoryScaledPolygon();
         polygon.addPoint(0.0d, 0.0d);
         int lastTotal = 0;
-        for (Iterator<AbstractGCEvent<?>> i = model.getStopTheWorldEvents(); i.hasNext();) {
-            AbstractGCEvent<?> abstractGCEvent = i.next();
-            if (abstractGCEvent instanceof GCEvent) {
-                GCEvent event = (GCEvent) abstractGCEvent;
-                if (event.getTotal() > 0) {
-                    // there are events that don't have a heap size associated (like "GC remark" of G1)
-                    // -> skip them
-                    if (polygon.npoints == 1) {
-                        // first point needs to be treated different from the rest,
-                        // because otherwise the polygon would not start with a vertical line at 0,
-                        // but with a slanting line between 0 and after the first pause
-                        polygon.addPoint(0, (double)event.getTotal());
-                    }
-                    polygon.addPoint(event.getTimestamp() - model.getFirstPauseTimeStamp() + event.getPause(), event.getTotal());
-                    lastTotal = event.getTotal();
+        for (Iterator<AbstractGCEvent<?>> i = model.getEvents(); i.hasNext();) {
+            AbstractGCEvent<?> event = i.next();
+            if (event.getTotal() > 0) {
+                // there are events that don't have a heap size associated (like "GC remark" of G1)
+                // -> skip them
+                if (polygon.npoints == 1) {
+                    // first point needs to be treated different from the rest,
+                    // because otherwise the polygon would not start with a vertical line at 0,
+                    // but with a slanting line between 0 and after the first pause
+                    polygon.addPoint(0, (double)event.getTotal());
                 }
+                polygon.addPoint(event.getTimestamp() - model.getFirstPauseTimeStamp(), event.getTotal());
+                lastTotal = event.getTotal();
             }
         }
         polygon.addPointNotOptimised(model.getRunningTime(), lastTotal);
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/TotalTenuredRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/TotalTenuredRenderer.java
@@ -48,7 +48,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {
                         // but with a slanting line between 0 and after the first pause
                         polygon.addPoint(0, (double)tenured.getTotal());
                     }
-                    polygon.addPoint(tenured.getTimestamp() - model.getFirstPauseTimeStamp() + event.getPause(),
+                    polygon.addPoint(tenured.getTimestamp() - model.getFirstPauseTimeStamp(),
                             tenured.getTotal());
                     lastTotal = tenured.getTotal();
                 }
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/TotalYoungRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/TotalYoungRenderer.java
@@ -57,7 +57,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {
                         // but with a slanting line between 0 and after the first pause
                         polygon.addPoint(0, tenuredSize + youngSize);
                     }
-                    polygon.addPoint(event.getTimestamp() - model.getFirstPauseTimeStamp() + event.getPause(), tenuredSize + youngSize);
+                    polygon.addPoint(event.getTimestamp() - model.getFirstPauseTimeStamp(), tenuredSize + youngSize);
                     lastYoung = youngSize;
                     lastTenured = tenuredSize;
                 }
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/UsedHeapRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/UsedHeapRenderer.java
@@ -6,7 +6,6 @@
 import java.util.Iterator;
 
 import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
-import com.tagtraum.perf.gcviewer.model.GCEvent;
 import com.tagtraum.perf.gcviewer.model.GCModel;
 import com.tagtraum.perf.gcviewer.view.ModelChart;
 import com.tagtraum.perf.gcviewer.view.ModelChartImpl;
@@ -30,16 +29,13 @@ public UsedHeapRenderer(ModelChartImpl modelChart) {
 
     public Polygon computePolygon(ModelChart modelChart, GCModel model) {
         ScaledPolygon polygon = createMemoryScaledPolygon();
-        for (Iterator<AbstractGCEvent<?>> i = model.getStopTheWorldEvents(); i.hasNext();) {
-            AbstractGCEvent<?> abstractGCEvent = i.next();
-            if (abstractGCEvent instanceof GCEvent) {
-                GCEvent event = (GCEvent) abstractGCEvent;
-                // e.g. "GC remark" of G1 algorithm does not contain memory information
-                if (event.getTotal() > 0) {
-                    final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp();
-                    polygon.addPoint(timestamp, event.getPreUsed());
-                    polygon.addPoint(timestamp + event.getPause(), event.getPostUsed());
-                }
+        for (Iterator<AbstractGCEvent<?>> i = model.getEvents(); i.hasNext();) {
+            AbstractGCEvent<?> event = i.next();
+            // e.g. "GC remark" of G1 algorithm does not contain memory information
+            if (event.getTotal() > 0) {
+                final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp() - event.getPause();
+                polygon.addPoint(timestamp, event.getPreUsed());
+                polygon.addPoint(timestamp + event.getPause(), event.getPostUsed());
             }
         }
         // dummy point to make the polygon complete
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/UsedTenuredRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/UsedTenuredRenderer.java
@@ -39,7 +39,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {
                     // only -XX:+PrintGCDetails adds information about generations
                     // e.g. "GC remark" of G1 algorithm does not contain memory information
                     if (tenuredEvent.getTotal() > 0) {
-                        final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp();
+                        final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp() - event.getPause();
                         polygon.addPoint(timestamp, tenuredEvent.getPreUsed());
                         polygon.addPoint(timestamp + event.getPause(), tenuredEvent.getPostUsed());
                     }
diff --git a/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/UsedYoungRenderer.java b/src/main/java/com/tagtraum/perf/gcviewer/view/renderer/UsedYoungRenderer.java
@@ -54,7 +54,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {
                     }
                     // e.g. "GC remark" of G1 algorithm does not contain memory information
                     if (youngEvent.getTotal() > 0) {
-                        final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp();
+                        final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp() - event.getPause();
                         polygon.addPoint(timestamp, lastTenuredTotal + youngEvent.getPreUsed());
                         polygon.addPoint(timestamp + event.getPause(), tenuredTotal + youngEvent.getPostUsed());
                     }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {`
`48`	`48`	`// but with a slanting line between 0 and after the first pause`
`49`	`49`	`polygon.addPoint(0, (double)tenured.getTotal());`
`50`	`50`	`}`
`51`		`- polygon.addPoint(tenured.getTimestamp() - model.getFirstPauseTimeStamp() + event.getPause(),`
	`51`	`+ polygon.addPoint(tenured.getTimestamp() - model.getFirstPauseTimeStamp(),`
`52`	`52`	`tenured.getTotal());`
`53`	`53`	`lastTotal = tenured.getTotal();`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {`
`57`	`57`	`// but with a slanting line between 0 and after the first pause`
`58`	`58`	`polygon.addPoint(0, tenuredSize + youngSize);`
`59`	`59`	`}`
`60`		`- polygon.addPoint(event.getTimestamp() - model.getFirstPauseTimeStamp() + event.getPause(), tenuredSize + youngSize);`
	`60`	`+ polygon.addPoint(event.getTimestamp() - model.getFirstPauseTimeStamp(), tenuredSize + youngSize);`
`61`	`61`	`lastYoung = youngSize;`
`62`	`62`	`lastTenured = tenuredSize;`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {`
`39`	`39`	`// only -XX:+PrintGCDetails adds information about generations`
`40`	`40`	`// e.g. "GC remark" of G1 algorithm does not contain memory information`
`41`	`41`	`if (tenuredEvent.getTotal() > 0) {`
`42`		`- final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp();`
	`42`	`+ final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp() - event.getPause();`
`43`	`43`	`polygon.addPoint(timestamp, tenuredEvent.getPreUsed());`
`44`	`44`	`polygon.addPoint(timestamp + event.getPause(), tenuredEvent.getPostUsed());`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public Polygon computePolygon(ModelChart modelChart, GCModel model) {`
`54`	`54`	`}`
`55`	`55`	`// e.g. "GC remark" of G1 algorithm does not contain memory information`
`56`	`56`	`if (youngEvent.getTotal() > 0) {`
`57`		`- final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp();`
	`57`	`+ final double timestamp = event.getTimestamp() - model.getFirstPauseTimeStamp() - event.getPause();`
`58`	`58`	`polygon.addPoint(timestamp, lastTenuredTotal + youngEvent.getPreUsed());`
`59`	`59`	`polygon.addPoint(timestamp + event.getPause(), tenuredTotal + youngEvent.getPostUsed());`
`60`	`60`	`}`