Changeset 14261 in josm for trunk/test/unit/org

Timestamp:

2018-09-19T21:57:27+02:00 (6 years ago)

Author:

wiktorn

Message:

Use corePoolSize = maxPoolSize and unbounded queue

Remove hack with calling setCorePoolSize to spawn new threads when already
corePoolSize is running. For bigger sizes of the ThreadPool setCorePoolSize took
a long time and blocked EDT thread. Now we will have always `maximum concurren
downloads` threads running for TMS layers, but this is not a big issue, as the
thread pool is shared between imagery layers.

As long as number of threads will not reach the maximum concurrent downloads
the maximum concurrent downloads per host limit will not be enforced (first n
downloads).

See: #16734

File:

• trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java

@@ -14 +14 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.TileJobOptions;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -33 +33 @@
     public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20 * 1000);
 
-    private static ThreadPoolExecutor getNewThreadPoolExecutor(String nameFormat, int workers, int queueLimit) {
-        HostLimitQueue workQueue = new HostLimitQueue(queueLimit);
-        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
-                300, // keepalive for thread
-                TimeUnit.SECONDS,
-                workQueue,
-                Utils.newThreadFactory(nameFormat, Thread.NORM_PRIORITY)
-                );
-        workQueue.setExecutor(executor);
-        return executor;
-    }
 
     /**
@@ -94 +81 @@
     @Test
     public void testSingleThreadPerHost() throws Exception {
-        ThreadPoolExecutor tpe = getNewThreadPoolExecutor("test-%d", 3, 1);
+        ThreadPoolExecutor tpe = TMSCachedTileLoader.getNewThreadPoolExecutor("test-%d", 3, 1);
         ICacheAccess<String, CacheEntry> cache = JCSCacheManager.getCache("test", 3, 0, "");
         AtomicInteger counter = new AtomicInteger(0);
@@ -107 +94 @@
         assertEquals(10, counter.get());
         // although there are 3 threads, we can make only 1 parallel call to localhost
-        // so it should take ~10 seconds to finish
+        // first three jobs will be not limited, as they spawn the thread
+        // so it should take ~8 seconds to finish
         // if it's shorter, it means that host limit does not work
-        assertTrue("Expected duration between 9 and 11 seconds not met. Actual duration: " + (duration /1000),
-                duration < 11*1000 & duration > 9*1000);
+        assertTrue("Expected duration between 8 and 11 seconds not met. Actual duration: " + (duration /1000),
+                duration < 11*1000 & duration > 8*1000);
     }
 
@@ -119 +107 @@
     @Test
     public void testMultipleThreadPerHost() throws Exception {
-        ThreadPoolExecutor tpe = getNewThreadPoolExecutor("test-%d", 3, 2);
+        ThreadPoolExecutor tpe = TMSCachedTileLoader.getNewThreadPoolExecutor("test-%d", 3, 2);
         ICacheAccess<String, CacheEntry> cache = JCSCacheManager.getCache("test", 3, 0, "");
         AtomicInteger counter = new AtomicInteger(0);
@@ -144 +132 @@
     @Test
     public void testTwoHosts() throws Exception {
-        ThreadPoolExecutor tpe = getNewThreadPoolExecutor("test-%d", 3, 1);
+        ThreadPoolExecutor tpe = TMSCachedTileLoader.getNewThreadPoolExecutor("test-%d", 3, 1);
         ICacheAccess<String, CacheEntry> cache = JCSCacheManager.getCache("test", 3, 0, "");
         AtomicInteger counter = new AtomicInteger(0);