Changeset 12100 in josm for trunk/src

Timestamp:

2017-05-10T23:15:07+02:00 (7 years ago)

Author:

michael2402

Message:

See #14765: Use a try-lock for map painting code: Don't freeze JOSM if layer is locked too long.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)

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

@@ -35 +35 @@
 import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -80 +81 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -1529 +1531 @@
         getSettings(renderVirtualNodes);
 
-        data.getReadLock().lock();
+        try {
+            if (data.getReadLock().tryLock(1, TimeUnit.SECONDS)) {
+                try {
+                    paintWithLock(data, renderVirtualNodes, benchmark, bbox);
+                } finally {
+                    data.getReadLock().unlock();
+                }
+            } else {
+                Logging.warn("Cannot paint layer {0}: It is locked.");
+            }
+        } catch (InterruptedException e) {
+            Logging.warn("Cannot paint layer {0}: Interrupted");
+        }
+    }
+
+    private void paintWithLock(final DataSet data, boolean renderVirtualNodes, RenderBenchmarkCollector benchmark,
+            BBox bbox) {
         try {
             highlightWaySegments = data.getHighlightedWaySegments();
@@ -1575 +1593 @@
                     .put("paintSettings", paintSettings)
                     .put("renderVirtualNodes", renderVirtualNodes);
-        } finally {
-            data.getReadLock().unlock();
         }
     }