Changeset 10674 in josm for trunk/test/performance/org/openstreetmap

Timestamp:

2016-07-29T22:15:28+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13239, fix #13240 - Java 8: MapCSS Condition class (patches by michael2402) - gsoc-core

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• PerformanceTestUtils.java (modified) (6 diffs)
• gui/mappaint/mapcss/MapCSSConditionPerformanceTest.java (added)
• gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java (modified) (5 diffs)

trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm;
+
+import java.util.ArrayList;
+import java.util.Collections;
 
 import org.openstreetmap.josm.io.XmlWriter;
@@ -11 +14 @@
  */
 public final class PerformanceTestUtils {
+    private static final int TIMES_WARMUP = 2;
+    private static final int TIMES_RUN = 8;
+
+    /**
+     * A helper class that captures the time from object creation until #done() was called.
+     * @author Michael Zangl
+     */
+    public static class PerformanceTestTimerCapture {
+        private final long time;
+
+        protected PerformanceTestTimerCapture() {
+            time = System.nanoTime();
+        }
+
+        /**
+         * Get the time since this object was created.
+         * @return The time.
+         */
+        public long getTimeSinceCreation() {
+            return (System.nanoTime() - time) / 1000000;
+        }
+    }
+
     /**
      * A timer that measures the time from it's creation to the {@link #done()} call.
      * @author Michael Zangl
      */
-    public static class PerformanceTestTimer {
+    public static class PerformanceTestTimer extends PerformanceTestTimerCapture {
         private final String name;
-        private final long time;
-        private boolean measurementPlotsPlugin = false;
+        private boolean measurementPlotsPlugin = true;
 
         protected PerformanceTestTimer(String name) {
             this.name = name;
-            time = System.nanoTime();
         }
 
@@ -37 +61 @@
          */
         public void done() {
-            long dTime = (System.nanoTime() - time) / 1000000;
+            long dTime = getTimeSinceCreation();
             if (measurementPlotsPlugin) {
                 measurementPlotsPluginOutput(name + "(ms)", dTime);
@@ -50 +74 @@
 
     /**
-     * Starts a new performance timer.
+     * Starts a new performance timer. The timer will output the measurements in a format understood by Jenkins.
+     * <p>
+     * The timer can only be used to meassure one value.
      * @param name The name/description of the timer.
      * @return A {@link PerformanceTestTimer} object of which you can call {@link PerformanceTestTimer#done()} when done.
@@ -56 +82 @@
     @SuppressFBWarnings(value = "DM_GC", justification = "Performance test code")
     public static PerformanceTestTimer startTimer(String name) {
+        cleanSystem();
+        return new PerformanceTestTimer(name);
+    }
+
+    /**
+     * Runs the given performance test several (approx. 10) times and prints the median run time.
+     * @param name The name to use in the output
+     * @param testRunner The test to run
+     */
+    public static void runPerformanceTest(String name, Runnable testRunner) {
+        for (int i = 0; i < TIMES_WARMUP; i++) {
+            cleanSystem();
+            PerformanceTestTimerCapture capture = new PerformanceTestTimerCapture();
+            testRunner.run();
+            capture.getTimeSinceCreation();
+        }
+        ArrayList<Long> times = new ArrayList<>();
+        for (int i = 0; i < TIMES_RUN; i++) {
+            cleanSystem();
+            PerformanceTestTimerCapture capture = new PerformanceTestTimerCapture();
+            testRunner.run();
+            times.add(capture.getTimeSinceCreation());
+        }
+        System.out.println(times);
+        Collections.sort(times);
+        // Sort out e.g. GC during test run.
+        double avg = times.subList(2, times.size() - 2).stream().mapToLong(l -> l).average().getAsDouble();
+        measurementPlotsPluginOutput(name, avg);
+    }
+
+    private static void cleanSystem() {
         System.gc();
         System.runFinalization();
-        return new PerformanceTestTimer(name);
     }
 
@@ -68 +124 @@
      * @param name the name / title of the measurement
      * @param value the value
-     * @see https://wiki.jenkins-ci.org/display/JENKINS/Measurement+Plots+Plugin
+     * @see "https://wiki.jenkins-ci.org/display/JENKINS/Measurement+Plots+Plugin"
      */
     public static void measurementPlotsPluginOutput(String name, double value) {

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java

@@ -104 +104 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addKeyValueRules(TEST_RULE_COUNT);
-        runTest(data, css, "only key=value rules", false);
+        runTest(data, css, "only key=value rules");
     }
 
@@ -115 +115 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addHasKeyRules(TEST_RULE_COUNT);
-        runTest(data, css, "only has key rules", false);
+        runTest(data, css, "only has key rules");
     }
 
@@ -126 +126 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addKeyRegexpRules(TEST_RULE_COUNT);
-        runTest(data, css, "regular expressions", true);
+        runTest(data, css, "regular expressions");
     }
 
@@ -137 +137 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addIsTrueRules(TEST_RULE_COUNT);
-        runTest(data, css, "is true", false);
+        runTest(data, css, "is true");
     }
 
-    private void runTest(KeyValueDataGenerator data, CssGenerator css, String description, boolean measurementPlotsPlugin) {
+    private void runTest(KeyValueDataGenerator data, CssGenerator css, String description) {
         MapCSSStyleSource source = new MapCSSStyleSource(css.getCss());
         PerformanceTestTimer timer = PerformanceTestUtils.startTimer("MapCSSStyleSource#loadStyleSource(...) for " + description);
@@ -146 +146 @@
         timer.done();
 
-        if (measurementPlotsPlugin) {
-            timer = PerformanceTestUtils.startTimer(description);
-            timer.setMeasurementPlotsPluginOutput(true);
-        } else {
-            timer = PerformanceTestUtils.startTimer(APPLY_CALLS + "x MapCSSStyleSource#apply(...) for " + description);
-        }
+        timer = PerformanceTestUtils.startTimer(APPLY_CALLS + "x MapCSSStyleSource#apply(...) for " + description);
         for (int i = 0; i < APPLY_CALLS; i++) {
             MultiCascade mc = new MultiCascade();