Changeset 9788 in josm for trunk

Timestamp:

2016-02-12T10:13:29+01:00 (8 years ago)

Author:

bastiK

Message:

Jenkins truncates stdout, try to shorten it a bit

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java (modified) (2 diffs)

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

@@ -1905 +1905 @@
             if (benchmark) {
                 timeStart = System.currentTimeMillis();
-                System.err.print("BENCHMARK: rendering ");
+                if (benchmarkOutput) {
+                    System.err.print("BENCHMARK: rendering ");
+                }
             }
 

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

@@ -211 +211 @@
                     totalTimes.add(data.generateTime + data.sortTime + data.drawTime);
                 }
-                dump(data);
+                if (i == 1) {
+                    dumpElementCount(data);
+                }
+                dumpTimes(data);
                 if (dumpImage && i == noTotal) {
                     dumpRenderedImage(label);
@@ -307 +310 @@
     }
 
-    public static void dump(StyledMapRenderer.BenchmarkData bd) {
-        System.out.println("generate style elements: " + bd.generateTime);
-        System.out.println("sort style elements:     " + bd.sortTime);
-        System.out.println("draw style elements:     " + bd.drawTime);
-        System.out.print("rendered elements:");
+    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()) {
-            System.out.print(" "+e.getKey().getSimpleName()+"="+e.getValue());
+            if (sep == null) {
+                sep = " ";
+            } else {
+                System.out.print(sep);
+            }
+            System.out.print(e.getKey().getSimpleName().replace("Element", "") + ":" + e.getValue());
         }
         System.out.println();