Changeset 9004 in josm for trunk

Timestamp:

2015-11-14T11:43:02+01:00 (9 years ago)

Author:

wiktorn

Message:

Fix high CPU usage when showing small tiles.

• AbstractTileSourceLayer - check insane() zoom level based on TileCache size instead of hardcoded value
• TileCache - add interface to check size of the cache
• TMSCachedTileLoader - remove unnnecessary TileCache interface and its methods
• HostLimitQueue - correct log message
• JCSCachedTileLoaderJob - add debug logs for putting request into queue and start of processing

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/HostLimitQueue.java (modified) (2 diffs)
• data/cache/JCSCachedTileLoaderJob.java (modified) (2 diffs)
• data/imagery/TMSCachedTileLoader.java (modified) (3 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java

@@ -54 +54 @@
                         return job;
                     } else {
-                        // we have acquired the semaphore, but we didn't manage to remove it, as someone else did
+                        // we have acquired the semaphore, but we didn't manage to remove job, as someone else did
                         // release the semaphore and look for another candidate
                         releaseSemaphore(job);
@@ -67 +67 @@
                         }
                     }
-                    Main.debug("TMS - Queuing job {0} because host limit reached", url);
+                    Main.debug("TMS - Skipping job {0} because host limit reached", url);
                 }
             }

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -174 +174 @@
         if (first || force) {
             // submit all jobs to separate thread, so calling thread is not blocked with IO when loading from disk
+            log.log(Level.FINE, "JCS - Submitting job for execution for url: {0}", getUrlNoException());
             downloadJobExecutor.execute(this);
         }
@@ -221 +222 @@
         final String oldName = currentThread.getName();
         currentThread.setName("JCS Downloading: " + getUrlNoException());
+        log.log(Level.FINE, "JCS - starting fetch of url: {0} ", getUrlNoException());
         ensureCacheElement();
         try {

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -10 +10 @@
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -26 +25 @@
  *
  */
-public class TMSCachedTileLoader implements TileLoader, CachedTileLoader, TileCache {
+public class TMSCachedTileLoader implements TileLoader, CachedTileLoader {
 
     protected final ICacheAccess<String, BufferedImageCacheEntry> cache;
@@ -108 +107 @@
     }
 
-    @Override
-    public Tile getTile(TileSource source, int x, int y, int z) {
-        return createTileLoaderJob(new Tile(source, x, y, z)).getTile();
-    }
-
-    @Override
-    public void addTile(Tile tile) {
-        createTileLoaderJob(tile).getTile();
-    }
-
-    @Override
-    public int getTileCount() {
-        return 0;
-    }
-
-    @Override
-    public void clear() {
-        cache.clear();
-    }
-
     /**
      * @return cache statistics as string

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1215 +1215 @@
 
         private boolean tooLarge() {
-            return this.tilesSpanned() > 20;
+            return insane() || this.tilesSpanned() > 20;
         }
 
         private boolean insane() {
-            return this.tilesSpanned() > 100;
+            return size() > tileCache.getCacheSize();
         }