Changeset 7043 in josm

Timestamp:

2014-05-02T00:43:10+02:00 (11 years ago)

Author:

bastiK

Message:

see #9691 - added command line option to enable debug level trace
added map paint performance output for trace level debug

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

trunk/build.xml

@@ -190 +190 @@
             <arg value="${javacc.home}/javacc.jar"/>
             <arg value="javacc"/>
+            <arg value="-DEBUG_PARSER=false"/>
+            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
             <arg value="-JDK_VERSION=1.7"/>
             <arg value="-GRAMMAR_ENCODING=UTF-8"/>

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

@@ -1404 +1404 @@
 
         highlightWaySegments = data.getHighlightedWaySegments();
+        
+        long timeStart=0, timePhase1=0, timeFinished;
+        if (Main.isTraceEnabled()) {
+            timeStart = System.currentTimeMillis();
+            System.err.print("BENCHMARK: rendering ");
+            Main.debug(null);
+        }
 
         StyleCollector sc = new StyleCollector(drawArea, drawMultipolygon, drawRestriction);
@@ -1409 +1416 @@
         collectWayStyles(data, sc, bbox);
         collectRelationStyles(data, sc, bbox);
+        
+        if (Main.isTraceEnabled()) {
+            timePhase1 = System.currentTimeMillis();
+            System.err.print("phase 1 (calculate styles): " + (timePhase1 - timeStart) + " ms");
+        }
+        
         sc.drawAll();
         sc = null;
+
+        if (Main.isTraceEnabled()) {
+            timeFinished = System.currentTimeMillis();
+            System.err.println("; phase 2 (draw): " + (timeFinished - timePhase1) + " ms; total: " + (timeFinished - timeStart) + " ms");
+        }
+
         drawVirtualNodes(data, bbox);
     }

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -154 +154 @@
         /** --debug                                   Print debugging messages to console */
         DEBUG(false),
+        /** --trace                                   Print detailed debugging messages to console */
+        TRACE(false),
         /** --language=<language>               Set the language */
         LANGUAGE(true),
@@ -318 +320 @@
         }
 
-        if (args.containsKey(Option.DEBUG)) {
+        if (args.containsKey(Option.DEBUG) || args.containsKey(Option.TRACE)) {
             // Enable JOSM debug level
             logLevel = 4;
             // Enable debug in OAuth signpost
             Preferences.updateSystemProperty("debug", "true");
-            Main.debug(tr("Print debugging messages to console"));
+            Main.info(tr("Printing debugging messages to console"));
+        }
+
+        if (args.containsKey(Option.TRACE)) {
+            // Enable JOSM debug level
+            logLevel = 5;
+            Main.info(tr("Enabled detailed debug level (trace)"));
         }