Changeset 11438 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

Timestamp:

2017-01-07T09:44:59+01:00 (7 years ago)

Author:

wiktorn

Message:

Fix thread pool for WMS

Because threds in WMS download ThreadPool never died, the unreferenced ThreadPool object (and its threads) was never cleared. To fix this minimum size of ThreadPool was changed to 0.

But due to the fact, that ThreadPoolExecutor spawns new Thread only when workQueue refuses to take a new job, workaround is implemented in HostLimitQueue based on: ​http://stackoverflow.com/questions/9622599/java-threadpoolexecutor-strategy-direct-handoff-with-queue#

WMS Settings was fixed so now WMS has it's own THREAD_LIMIT setting not connected to JCS default setting.

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java (modified) (1 diff)

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

@@ -78 +78 @@
      */
     public static ThreadPoolExecutor getNewThreadPoolExecutor(String nameFormat, int workers) {
-        return new ThreadPoolExecutor(
-                workers, // keep the thread number constant
+        HostLimitQueue workQueue = new HostLimitQueue(HOST_LIMIT.get().intValue());
+        ThreadPoolExecutor executor = new ThreadPoolExecutor(
+                0, // 0 so for unused thread pools threads will eventually die, freeing also the threadpool
                 workers, // do not this number of threads
-                30, // keepalive for thread
+                300, // keepalive for thread
                 TimeUnit.SECONDS,
-                new HostLimitQueue(HOST_LIMIT.get().intValue()),
+                workQueue,
                 Utils.newThreadFactory(nameFormat, Thread.NORM_PRIORITY)
                 );
+        workQueue.setExecutor(executor);
+        return executor;
     }