Changeset 10697 in josm for trunk

Timestamp:

2016-08-01T22:56:04+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13258 - Pull benchmark code out of renderer (patch by michael2402) - gsoc-core

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/RenderBenchmarkCollector.java (added)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (9 diffs)
• test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -37 +37 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.RecursiveTask;
+import java.util.function.Supplier;
 
 import javax.swing.AbstractButton;
@@ -63 +64 @@
 import org.openstreetmap.josm.gui.mappaint.StyleElementList;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
@@ -192 +192 @@
     }
 
-    private static class StyleRecord implements Comparable<StyleRecord> {
+    public static class StyleRecord implements Comparable<StyleRecord> {
         private final StyleElement style;
         private final OsmPrimitive osm;
@@ -240 +240 @@
             return Float.compare(this.style.objectZIndex, other.style.objectZIndex);
         }
-    }
-
-    /**
-     * Saves benchmark data for tests.
-     */
-    public static class BenchmarkData {
-        public long generateTime;
-        public long sortTime;
-        public long drawTime;
-        public Map<Class<? extends StyleElement>, Integer> styleElementCount;
-        public boolean skipDraw;
-
-        private void recordElementStats(List<StyleRecord> srs) {
-            styleElementCount = new HashMap<>();
-            for (StyleRecord r : srs) {
-                Class<? extends StyleElement> klass = r.style.getClass();
-                Integer count = styleElementCount.get(klass);
-                if (count == null) {
-                    count = 0;
-                }
-                styleElementCount.put(klass, count + 1);
-            }
-
-        }
-    }
-
-    /* can be set by tests, if detailed benchmark data is requested */
-    public BenchmarkData benchmarkData;
+
+        /**
+         * Get the style for this style element.
+         * @return The style
+         */
+        public StyleElement getStyle() {
+            return style;
+        }
+    }
 
     private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
@@ -373 +354 @@
     private boolean leftHandTraffic;
     private Object antialiasing;
+
+    private Supplier<RenderBenchmarkCollector> benchmarkFactory = RenderBenchmarkCollector.defaultBenchmarkSupplier();
 
     /**
@@ -1902 +1885 @@
     }
 
+    /**
+     * Sets the factory that creates the benchmark data receivers.
+     * @param benchmarkFactory The factory.
+     * @since 10697
+     */
+    public void setBenchmarkFactory(Supplier<RenderBenchmarkCollector> benchmarkFactory) {
+        this.benchmarkFactory = benchmarkFactory;
+    }
+
     @Override
     public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
+        RenderBenchmarkCollector benchmark = benchmarkFactory.get();
         BBox bbox = bounds.toBBox();
         getSettings(renderVirtualNodes);
-        boolean benchmarkOutput = Main.isTraceEnabled() || Main.pref.getBoolean("mappaint.render.benchmark", false);
-        boolean benchmark = benchmarkOutput || benchmarkData != null;
 
         data.getReadLock().lock();
@@ -1913 +1904 @@
             highlightWaySegments = data.getHighlightedWaySegments();
 
-            long timeStart = 0, timeGenerateDone = 0, timeSortingDone = 0, timeFinished;
-            if (benchmark) {
-                timeStart = System.currentTimeMillis();
-                if (benchmarkOutput) {
-                    System.err.print("BENCHMARK: rendering ");
-                }
-            }
+            benchmark.renderStart(circum);
 
             List<Node> nodes = data.searchNodes(bbox);
@@ -1937 +1922 @@
                     Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3)));
 
-            if (benchmark) {
-                timeGenerateDone = System.currentTimeMillis();
-                if (benchmarkOutput) {
-                    System.err.print("phase 1 (calculate styles): " + Utils.getDurationString(timeGenerateDone - timeStart));
-                }
-                if (benchmarkData != null) {
-                    benchmarkData.generateTime = timeGenerateDone - timeStart;
-                }
+            if (!benchmark.renderSort()) {
+                return;
             }
 
             Collections.sort(allStyleElems); // TODO: try parallel sort when switching to Java 8
 
-            if (benchmarkData != null) {
-                timeSortingDone = System.currentTimeMillis();
-                benchmarkData.sortTime = timeSortingDone - timeGenerateDone;
-                if (benchmarkData.skipDraw) {
-                    benchmarkData.recordElementStats(allStyleElems);
-                    return;
-                }
+            if (!benchmark.renderDraw(allStyleElems)) {
+                return;
             }
 
@@ -1969 +1943 @@
             }
 
-            if (benchmark) {
-                timeFinished = System.currentTimeMillis();
-                if (benchmarkData != null) {
-                    benchmarkData.drawTime = timeFinished - timeGenerateDone;
-                    benchmarkData.recordElementStats(allStyleElems);
-                }
-                if (benchmarkOutput) {
-                    System.err.println("; phase 2 (draw): " + Utils.getDurationString(timeFinished - timeGenerateDone) +
-                        "; total: " + Utils.getDurationString(timeFinished - timeStart) +
-                        " (scale: " + circum + " zoom level: " + Selector.GeneralSelector.scale2level(circum) + ')');
-                }
-            }
-
             drawVirtualNodes(data, bbox);
+
+            benchmark.renderDone();
         } finally {
             data.getReadLock().unlock();

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -11 +11 @@
 import java.util.Collections;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.imageio.ImageIO;
@@ -30 +32 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.visitor.paint.RenderBenchmarkCollector.CapturingBenchmark;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -208 +212 @@
                     Main.warn(ex);
                 }
-                StyledMapRenderer.BenchmarkData data = new StyledMapRenderer.BenchmarkData();
-                data.skipDraw = skipDraw;
-                renderer.benchmarkData = data;
+                BenchmarkData data = new BenchmarkData();
+                renderer.setBenchmarkFactory(() -> data);
                 renderer.render(dsCity, false, bounds);
 
                 if (i > noWarmup) {
-                    generateTimes.add(data.generateTime);
-                    sortTimes.add(data.sortTime);
-                    drawTimes.add(data.drawTime);
-                    totalTimes.add(data.generateTime + data.sortTime + data.drawTime);
+                    generateTimes.add(data.getGenerateTime());
+                    sortTimes.add(data.getSortTime());
+                    drawTimes.add(data.getDrawTime());
+                    totalTimes.add(data.getGenerateTime() + data.getSortTime() + data.getDrawTime());
                 }
                 if (i == 1) {
@@ -318 +321 @@
     }
 
-    public static void dumpTimes(StyledMapRenderer.BenchmarkData bd) {
-        System.out.print(String.format("gen. %3d, sort %3d, draw %3d%n", bd.generateTime, bd.sortTime, bd.drawTime));
-    }
-
-    public static void dumpElementCount(StyledMapRenderer.BenchmarkData bd) {
-        String sep = null;
-        for (Map.Entry<Class<? extends StyleElement>, Integer> e : bd.styleElementCount.entrySet()) {
-            if (sep == null) {
-                sep = " ";
-            } else {
-                System.out.print(sep);
-            }
-            System.out.print(e.getKey().getSimpleName().replace("Element", "") + ":" + e.getValue());
-        }
-        System.out.println();
+    public static void dumpTimes(BenchmarkData bd) {
+        System.out.print(String.format("gen. %3d, sort %3d, draw %3d%n", bd.getGenerateTime(), bd.getSortTime(), bd.getDrawTime()));
+    }
+
+    public static void dumpElementCount(BenchmarkData bd) {
+        System.out.println(bd.recordElementStats().entrySet().stream()
+                .map(e -> e.getKey().getSimpleName().replace("Element", "") + ":" + e.getValue()).collect(Collectors.joining(" ")));
+    }
+
+    public static class BenchmarkData extends CapturingBenchmark {
+
+        private List<StyleRecord> allStyleElems;
+
+        @Override
+        public boolean renderDraw(List<StyleRecord> allStyleElems) {
+            this.allStyleElems = allStyleElems;
+            return super.renderDraw(allStyleElems);
+        }
+
+        private Map<Class<? extends StyleElement>, Integer> recordElementStats() {
+            Map<Class<? extends StyleElement>, Integer> styleElementCount = new HashMap<>();
+            for (StyleRecord r : allStyleElems) {
+                Class<? extends StyleElement> klass = r.getStyle().getClass();
+                Integer count = styleElementCount.get(klass);
+                if (count == null) {
+                    count = 0;
+                }
+                styleElementCount.put(klass, count + 1);
+            }
+            return styleElementCount;
+        }
     }
 }