30 |
|
import java.util.concurrent.ThreadPoolExecutor; |
31 |
|
import java.util.concurrent.TimeoutException; |
32 |
|
import java.util.concurrent.TimeUnit; |
33 |
+ |
import java.util.concurrent.atomic.AtomicInteger; |
34 |
|
import java.util.concurrent.locks.Condition; |
35 |
|
import java.util.concurrent.locks.ReentrantLock; |
36 |
|
|
101 |
|
} |
102 |
|
lock.lock(); |
103 |
|
try { |
104 |
< |
result = v; |
105 |
< |
exception = e; |
106 |
< |
done = true; |
107 |
< |
thread = null; |
108 |
< |
cond.signalAll(); |
104 |
> |
if (!done) { |
105 |
> |
result = v; |
106 |
> |
exception = e; |
107 |
> |
done = true; |
108 |
> |
thread = null; |
109 |
> |
cond.signalAll(); |
110 |
> |
} |
111 |
|
} |
112 |
|
finally { lock.unlock(); } |
113 |
|
} |
116 |
|
try { |
117 |
|
while (!done) |
118 |
|
cond.await(); |
119 |
+ |
if (cancelled) |
120 |
+ |
throw new CancellationException(); |
121 |
|
if (exception != null) |
122 |
|
throw new ExecutionException(exception); |
123 |
|
return result; |
129 |
|
long nanos = unit.toNanos(timeout); |
130 |
|
lock.lock(); |
131 |
|
try { |
132 |
< |
for (;;) { |
133 |
< |
if (done) break; |
129 |
< |
if (nanos < 0) |
132 |
> |
while (!done) { |
133 |
> |
if (nanos <= 0L) |
134 |
|
throw new TimeoutException(); |
135 |
|
nanos = cond.awaitNanos(nanos); |
136 |
|
} |
137 |
+ |
if (cancelled) |
138 |
+ |
throw new CancellationException(); |
139 |
|
if (exception != null) |
140 |
|
throw new ExecutionException(exception); |
141 |
|
return result; |
232 |
|
public void testExecute() throws InterruptedException { |
233 |
|
final ThreadPoolExecutor p = |
234 |
|
new CustomTPE(1, 1, |
235 |
< |
LONG_DELAY_MS, MILLISECONDS, |
235 |
> |
2 * LONG_DELAY_MS, MILLISECONDS, |
236 |
|
new ArrayBlockingQueue<Runnable>(10)); |
237 |
< |
final CountDownLatch done = new CountDownLatch(1); |
238 |
< |
final Runnable task = new CheckedRunnable() { |
239 |
< |
public void realRun() { |
240 |
< |
done.countDown(); |
235 |
< |
}}; |
236 |
< |
try { |
237 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
238 |
> |
final CountDownLatch done = new CountDownLatch(1); |
239 |
> |
final Runnable task = new CheckedRunnable() { |
240 |
> |
public void realRun() { done.countDown(); }}; |
241 |
|
p.execute(task); |
242 |
< |
assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS)); |
239 |
< |
} finally { |
240 |
< |
joinPool(p); |
242 |
> |
assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS)); |
243 |
|
} |
244 |
|
} |
245 |
|
|
254 |
|
new ArrayBlockingQueue<Runnable>(10)); |
255 |
|
final CountDownLatch threadStarted = new CountDownLatch(1); |
256 |
|
final CountDownLatch done = new CountDownLatch(1); |
257 |
< |
try { |
257 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
258 |
|
assertEquals(0, p.getActiveCount()); |
259 |
|
p.execute(new CheckedRunnable() { |
260 |
|
public void realRun() throws InterruptedException { |
264 |
|
}}); |
265 |
|
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
266 |
|
assertEquals(1, p.getActiveCount()); |
265 |
– |
} finally { |
267 |
|
done.countDown(); |
267 |
– |
joinPool(p); |
268 |
|
} |
269 |
|
} |
270 |
|
|
272 |
|
* prestartCoreThread starts a thread if under corePoolSize, else doesn't |
273 |
|
*/ |
274 |
|
public void testPrestartCoreThread() { |
275 |
< |
ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
276 |
< |
assertEquals(0, p.getPoolSize()); |
277 |
< |
assertTrue(p.prestartCoreThread()); |
278 |
< |
assertEquals(1, p.getPoolSize()); |
279 |
< |
assertTrue(p.prestartCoreThread()); |
280 |
< |
assertEquals(2, p.getPoolSize()); |
281 |
< |
assertFalse(p.prestartCoreThread()); |
282 |
< |
assertEquals(2, p.getPoolSize()); |
283 |
< |
joinPool(p); |
275 |
> |
ThreadPoolExecutor p = |
276 |
> |
new CustomTPE(2, 6, |
277 |
> |
LONG_DELAY_MS, MILLISECONDS, |
278 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
279 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
280 |
> |
assertEquals(0, p.getPoolSize()); |
281 |
> |
assertTrue(p.prestartCoreThread()); |
282 |
> |
assertEquals(1, p.getPoolSize()); |
283 |
> |
assertTrue(p.prestartCoreThread()); |
284 |
> |
assertEquals(2, p.getPoolSize()); |
285 |
> |
assertFalse(p.prestartCoreThread()); |
286 |
> |
assertEquals(2, p.getPoolSize()); |
287 |
> |
p.setCorePoolSize(4); |
288 |
> |
assertTrue(p.prestartCoreThread()); |
289 |
> |
assertEquals(3, p.getPoolSize()); |
290 |
> |
assertTrue(p.prestartCoreThread()); |
291 |
> |
assertEquals(4, p.getPoolSize()); |
292 |
> |
assertFalse(p.prestartCoreThread()); |
293 |
> |
assertEquals(4, p.getPoolSize()); |
294 |
> |
} |
295 |
|
} |
296 |
|
|
297 |
|
/** |
298 |
|
* prestartAllCoreThreads starts all corePoolSize threads |
299 |
|
*/ |
300 |
|
public void testPrestartAllCoreThreads() { |
301 |
< |
ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
302 |
< |
assertEquals(0, p.getPoolSize()); |
303 |
< |
p.prestartAllCoreThreads(); |
304 |
< |
assertEquals(2, p.getPoolSize()); |
305 |
< |
p.prestartAllCoreThreads(); |
306 |
< |
assertEquals(2, p.getPoolSize()); |
307 |
< |
joinPool(p); |
301 |
> |
ThreadPoolExecutor p = |
302 |
> |
new CustomTPE(2, 6, |
303 |
> |
LONG_DELAY_MS, MILLISECONDS, |
304 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
305 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
306 |
> |
assertEquals(0, p.getPoolSize()); |
307 |
> |
p.prestartAllCoreThreads(); |
308 |
> |
assertEquals(2, p.getPoolSize()); |
309 |
> |
p.prestartAllCoreThreads(); |
310 |
> |
assertEquals(2, p.getPoolSize()); |
311 |
> |
p.setCorePoolSize(4); |
312 |
> |
p.prestartAllCoreThreads(); |
313 |
> |
assertEquals(4, p.getPoolSize()); |
314 |
> |
p.prestartAllCoreThreads(); |
315 |
> |
assertEquals(4, p.getPoolSize()); |
316 |
> |
} |
317 |
|
} |
318 |
|
|
319 |
|
/** |
325 |
|
new CustomTPE(2, 2, |
326 |
|
LONG_DELAY_MS, MILLISECONDS, |
327 |
|
new ArrayBlockingQueue<Runnable>(10)); |
328 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
329 |
< |
final CountDownLatch threadProceed = new CountDownLatch(1); |
330 |
< |
final CountDownLatch threadDone = new CountDownLatch(1); |
331 |
< |
try { |
328 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
329 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
330 |
> |
final CountDownLatch threadProceed = new CountDownLatch(1); |
331 |
> |
final CountDownLatch threadDone = new CountDownLatch(1); |
332 |
|
assertEquals(0, p.getCompletedTaskCount()); |
333 |
|
p.execute(new CheckedRunnable() { |
334 |
|
public void realRun() throws InterruptedException { |
347 |
|
fail("timed out"); |
348 |
|
Thread.yield(); |
349 |
|
} |
330 |
– |
} finally { |
331 |
– |
joinPool(p); |
350 |
|
} |
351 |
|
} |
352 |
|
|
354 |
|
* getCorePoolSize returns size given in constructor if not otherwise set |
355 |
|
*/ |
356 |
|
public void testGetCorePoolSize() { |
357 |
< |
ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
358 |
< |
assertEquals(1, p.getCorePoolSize()); |
359 |
< |
joinPool(p); |
357 |
> |
ThreadPoolExecutor p = |
358 |
> |
new CustomTPE(1, 1, |
359 |
> |
LONG_DELAY_MS, MILLISECONDS, |
360 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
361 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
362 |
> |
assertEquals(1, p.getCorePoolSize()); |
363 |
> |
} |
364 |
|
} |
365 |
|
|
366 |
|
/** |
367 |
|
* getKeepAliveTime returns value given in constructor if not otherwise set |
368 |
|
*/ |
369 |
|
public void testGetKeepAliveTime() { |
370 |
< |
ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
371 |
< |
assertEquals(1, p.getKeepAliveTime(SECONDS)); |
372 |
< |
joinPool(p); |
370 |
> |
ThreadPoolExecutor p = |
371 |
> |
new CustomTPE(2, 2, |
372 |
> |
1000, MILLISECONDS, |
373 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
374 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
375 |
> |
assertEquals(1, p.getKeepAliveTime(SECONDS)); |
376 |
> |
} |
377 |
|
} |
378 |
|
|
379 |
|
/** |
380 |
|
* getThreadFactory returns factory in constructor if not set |
381 |
|
*/ |
382 |
|
public void testGetThreadFactory() { |
383 |
< |
ThreadFactory tf = new SimpleThreadFactory(); |
384 |
< |
ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler()); |
385 |
< |
assertSame(tf, p.getThreadFactory()); |
386 |
< |
joinPool(p); |
383 |
> |
ThreadFactory threadFactory = new SimpleThreadFactory(); |
384 |
> |
ThreadPoolExecutor p = |
385 |
> |
new CustomTPE(1, 2, |
386 |
> |
LONG_DELAY_MS, MILLISECONDS, |
387 |
> |
new ArrayBlockingQueue<Runnable>(10), |
388 |
> |
threadFactory, |
389 |
> |
new NoOpREHandler()); |
390 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
391 |
> |
assertSame(threadFactory, p.getThreadFactory()); |
392 |
> |
} |
393 |
|
} |
394 |
|
|
395 |
|
/** |
396 |
|
* setThreadFactory sets the thread factory returned by getThreadFactory |
397 |
|
*/ |
398 |
|
public void testSetThreadFactory() { |
399 |
< |
ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
400 |
< |
ThreadFactory tf = new SimpleThreadFactory(); |
401 |
< |
p.setThreadFactory(tf); |
402 |
< |
assertSame(tf, p.getThreadFactory()); |
403 |
< |
joinPool(p); |
399 |
> |
ThreadPoolExecutor p = |
400 |
> |
new CustomTPE(1, 2, |
401 |
> |
LONG_DELAY_MS, MILLISECONDS, |
402 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
403 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
404 |
> |
ThreadFactory threadFactory = new SimpleThreadFactory(); |
405 |
> |
p.setThreadFactory(threadFactory); |
406 |
> |
assertSame(threadFactory, p.getThreadFactory()); |
407 |
> |
} |
408 |
|
} |
409 |
|
|
410 |
|
/** |
411 |
|
* setThreadFactory(null) throws NPE |
412 |
|
*/ |
413 |
|
public void testSetThreadFactoryNull() { |
414 |
< |
ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
415 |
< |
try { |
416 |
< |
p.setThreadFactory(null); |
417 |
< |
shouldThrow(); |
418 |
< |
} catch (NullPointerException success) { |
419 |
< |
} finally { |
420 |
< |
joinPool(p); |
414 |
> |
ThreadPoolExecutor p = |
415 |
> |
new CustomTPE(1, 2, |
416 |
> |
LONG_DELAY_MS, MILLISECONDS, |
417 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
418 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
419 |
> |
try { |
420 |
> |
p.setThreadFactory(null); |
421 |
> |
shouldThrow(); |
422 |
> |
} catch (NullPointerException success) {} |
423 |
|
} |
424 |
|
} |
425 |
|
|
737 |
|
} |
738 |
|
|
739 |
|
/** |
740 |
< |
* shutdownNow returns a list containing tasks that were not run |
740 |
> |
* shutdownNow returns a list containing tasks that were not run, |
741 |
> |
* and those tasks are drained from the queue |
742 |
|
*/ |
743 |
< |
public void testShutdownNow() { |
744 |
< |
ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
745 |
< |
List l; |
746 |
< |
try { |
747 |
< |
for (int i = 0; i < 5; i++) |
748 |
< |
p.execute(new MediumPossiblyInterruptedRunnable()); |
749 |
< |
} |
750 |
< |
finally { |
743 |
> |
public void testShutdownNow() throws InterruptedException { |
744 |
> |
final int poolSize = 2; |
745 |
> |
final int count = 5; |
746 |
> |
final AtomicInteger ran = new AtomicInteger(0); |
747 |
> |
ThreadPoolExecutor p = |
748 |
> |
new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS, |
749 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
750 |
> |
CountDownLatch threadsStarted = new CountDownLatch(poolSize); |
751 |
> |
Runnable waiter = new CheckedRunnable() { public void realRun() { |
752 |
> |
threadsStarted.countDown(); |
753 |
|
try { |
754 |
< |
l = p.shutdownNow(); |
755 |
< |
} catch (SecurityException ok) { return; } |
754 |
> |
MILLISECONDS.sleep(2 * LONG_DELAY_MS); |
755 |
> |
} catch (InterruptedException success) {} |
756 |
> |
ran.getAndIncrement(); |
757 |
> |
}}; |
758 |
> |
for (int i = 0; i < count; i++) |
759 |
> |
p.execute(waiter); |
760 |
> |
assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS)); |
761 |
> |
assertEquals(poolSize, p.getActiveCount()); |
762 |
> |
assertEquals(0, p.getCompletedTaskCount()); |
763 |
> |
final List<Runnable> queuedTasks; |
764 |
> |
try { |
765 |
> |
queuedTasks = p.shutdownNow(); |
766 |
> |
} catch (SecurityException ok) { |
767 |
> |
return; // Allowed in case test doesn't have privs |
768 |
|
} |
769 |
|
assertTrue(p.isShutdown()); |
770 |
< |
assertTrue(l.size() <= 4); |
770 |
> |
assertTrue(p.getQueue().isEmpty()); |
771 |
> |
assertEquals(count - poolSize, queuedTasks.size()); |
772 |
> |
assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
773 |
> |
assertTrue(p.isTerminated()); |
774 |
> |
assertEquals(poolSize, ran.get()); |
775 |
> |
assertEquals(poolSize, p.getCompletedTaskCount()); |
776 |
|
} |
777 |
|
|
778 |
|
// Exception Tests |
1781 |
|
l.add(new StringTask()); |
1782 |
|
l.add(new StringTask()); |
1783 |
|
List<Future<String>> futures = |
1784 |
< |
e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); |
1784 |
> |
e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS); |
1785 |
|
assertEquals(2, futures.size()); |
1786 |
|
for (Future<String> future : futures) |
1787 |
|
assertSame(TEST_STRING, future.get()); |
1911 |
|
} |
1912 |
|
} |
1913 |
|
|
1914 |
+ |
/** |
1915 |
+ |
* get(cancelled task) throws CancellationException |
1916 |
+ |
* (in part, a test of CustomTPE itself) |
1917 |
+ |
*/ |
1918 |
+ |
public void testGet_cancelled() throws Exception { |
1919 |
+ |
final ExecutorService e = |
1920 |
+ |
new CustomTPE(1, 1, |
1921 |
+ |
LONG_DELAY_MS, MILLISECONDS, |
1922 |
+ |
new LinkedBlockingQueue<Runnable>()); |
1923 |
+ |
try { |
1924 |
+ |
final CountDownLatch blockerStarted = new CountDownLatch(1); |
1925 |
+ |
final CountDownLatch done = new CountDownLatch(1); |
1926 |
+ |
final List<Future<?>> futures = new ArrayList<>(); |
1927 |
+ |
for (int i = 0; i < 2; i++) { |
1928 |
+ |
Runnable r = new CheckedRunnable() { public void realRun() |
1929 |
+ |
throws Throwable { |
1930 |
+ |
blockerStarted.countDown(); |
1931 |
+ |
assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS)); |
1932 |
+ |
}}; |
1933 |
+ |
futures.add(e.submit(r)); |
1934 |
+ |
} |
1935 |
+ |
assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS)); |
1936 |
+ |
for (Future<?> future : futures) future.cancel(false); |
1937 |
+ |
for (Future<?> future : futures) { |
1938 |
+ |
try { |
1939 |
+ |
future.get(); |
1940 |
+ |
shouldThrow(); |
1941 |
+ |
} catch (CancellationException success) {} |
1942 |
+ |
try { |
1943 |
+ |
future.get(LONG_DELAY_MS, MILLISECONDS); |
1944 |
+ |
shouldThrow(); |
1945 |
+ |
} catch (CancellationException success) {} |
1946 |
+ |
assertTrue(future.isCancelled()); |
1947 |
+ |
assertTrue(future.isDone()); |
1948 |
+ |
} |
1949 |
+ |
done.countDown(); |
1950 |
+ |
} finally { |
1951 |
+ |
joinPool(e); |
1952 |
+ |
} |
1953 |
+ |
} |
1954 |
+ |
|
1955 |
|
} |