Changeset 8397 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2015-05-19T20:54:26+02:00 (9 years ago)

Author:

wiktorn

Message:

addresses #11437 - introduce infinite queue for tile loading and clear the queue when user pans the map or changes the zoom. Fixing hosts limit is last problem, thay may incur additional load

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (7 diffs)

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

@@ -63 +63 @@
 
     public static class LIFOQueue extends LinkedBlockingDeque<Runnable> {
+        public LIFOQueue() {
+            super();
+        }
+
         public LIFOQueue(int capacity) {
             super(capacity);
@@ -91 +95 @@
      * and performance (we do want to have something to offer to worker threads before tasks will be resubmitted by class consumer)
      */
-    private static Executor DOWNLOAD_JOB_DISPATCHER = new ThreadPoolExecutor(
+    private static Executor DEFAULT_DOWNLOAD_JOB_DISPATCHER = new ThreadPoolExecutor(
             2, // we have a small queue, so threads will be quickly started (threads are started only, when queue is full)
             THREAD_LIMIT.get().intValue(), // do not this number of threads
@@ -114 +118 @@
     private int readTimeout;
     private Map<String, String> headers;
+    private Executor downloadJobExecutor;
 
     /**
@@ -120 +125 @@
      * @param readTimeout
      * @param connectTimeout
+     * @param downloadJobExecutor
      */
     public JCSCachedTileLoaderJob(ICacheAccess<K,V> cache,
             int connectTimeout, int readTimeout,
-            Map<String, String> headers) {
+            Map<String, String> headers,
+            Executor downloadJobExecutor) {
 
         this.cache = cache;
@@ -130 +137 @@
         this.readTimeout = readTimeout;
         this.headers = headers;
+        this.downloadJobExecutor = downloadJobExecutor;
+    }
+
+    /**
+     * @param cache cache instance that we will work on
+     * @param headers
+     * @param readTimeout
+     * @param connectTimeout
+     */
+    public JCSCachedTileLoaderJob(ICacheAccess<K, V> cache,
+            int connectTimeout, int readTimeout,
+            Map<String, String> headers) {
+        this(cache, connectTimeout, readTimeout,
+                headers, DEFAULT_DOWNLOAD_JOB_DISPATCHER);
     }
 
@@ -240 +261 @@
      */
     protected Executor getDownloadExecutor() {
-        return DOWNLOAD_JOB_DISPATCHER;
-    }
-
+        return downloadJobExecutor;
+    }
 
     public void run() {
@@ -330 +350 @@
                 return true;
             }
+
             HttpURLConnection urlConn = getURLConnection();