Changeset 15755 in josm for trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

Timestamp:

2020-01-23T22:57:46+01:00 (6 years ago)

Author:

simon04

Message:

Introduce Stopwatch class to measure elapsed time

File:

• trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Stopwatch;
 
 /**
@@ -46 +46 @@
      */
     public void checkReferrers() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         // It's also error when referred primitive's dataset is null but it's already covered by referredPrimitiveNotInDataset check
         for (Way way : dataSet.getWays()) {
@@ -67 +67 @@
             }
         }
-        printElapsedTime(startTime);
+        printElapsedTime(stopwatch);
     }
 
@@ -74 +74 @@
      */
     public void checkCompleteWaysWithIncompleteNodes() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         for (Way way : dataSet.getWays()) {
             if (way.isUsable()) {
@@ -84 +84 @@
             }
         }
-        printElapsedTime(startTime);
+        printElapsedTime(stopwatch);
     }
 
@@ -91 +91 @@
      */
     public void checkCompleteNodesWithoutCoordinates() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         for (Node node : dataSet.getNodes()) {
             if (!node.isIncomplete() && node.isVisible() && !node.isLatLonKnown()) {
@@ -97 +97 @@
             }
         }
-        printElapsedTime(startTime);
+        printElapsedTime(stopwatch);
     }
 
@@ -104 +104 @@
      */
     public void searchNodes() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         dataSet.getReadLock().lock();
         try {
@@ -116 +116 @@
             dataSet.getReadLock().unlock();
         }
-        printElapsedTime(startTime);
+        printElapsedTime(stopwatch);
     }
 
@@ -123 +123 @@
      */
     public void searchWays() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         dataSet.getReadLock().lock();
         try {
@@ -134 +134 @@
             dataSet.getReadLock().unlock();
         }
-        printElapsedTime(startTime);
+        printElapsedTime(stopwatch);
     }
 
@@ -155 +155 @@
      */
     public void referredPrimitiveNotInDataset() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         for (Way way : dataSet.getWays()) {
             for (Node node : way.getNodes()) {
@@ -167 +167 @@
             }
         }
-        printElapsedTime(startTime);
+        printElapsedTime(stopwatch);
     }
 
@@ -174 +174 @@
      */
     public void checkZeroNodesWays() {
-        long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         for (Way way : dataSet.getWays()) {
             if (way.isUsable() && way.getNodesCount() == 0) {
@@ -182 +182 @@
             }
         }
-        printElapsedTime(startTime);
-    }
-
-    private void printElapsedTime(long startTime) {
+        printElapsedTime(stopwatch);
+    }
+
+    private void printElapsedTime(Stopwatch stopwatch) {
         if (Logging.isDebugEnabled()) {
             StackTraceElement item = Thread.currentThread().getStackTrace()[2];
             String operation = getClass().getSimpleName() + '.' + item.getMethodName();
-            long elapsedTime = System.currentTimeMillis() - startTime;
             Logging.debug(tr("Test ''{0}'' completed in {1}",
-                    operation, Utils.getDurationString(elapsedTime)));
+                    operation, stopwatch));
         }
     }
@@ -200 +199 @@
     public void runTest() {
         try {
-            long startTime = System.currentTimeMillis();
+            final Stopwatch stopwatch = Stopwatch.createStarted();
             referredPrimitiveNotInDataset();
             checkReferrers();
@@ -208 +207 @@
             searchWays();
             checkZeroNodesWays();
-            printElapsedTime(startTime);
+            printElapsedTime(stopwatch);
             if (errorCount > MAX_ERRORS) {
                 writer.println((errorCount - MAX_ERRORS) + " more...");