14 |
|
import java.util.concurrent.ArrayBlockingQueue; |
15 |
|
import java.util.concurrent.BlockingQueue; |
16 |
|
import java.util.concurrent.Callable; |
17 |
+ |
import java.util.concurrent.CancellationException; |
18 |
|
import java.util.concurrent.CountDownLatch; |
19 |
|
import java.util.concurrent.ExecutionException; |
20 |
|
import java.util.concurrent.Executors; |
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; |
128 |
< |
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(); |
234 |
< |
}}; |
235 |
< |
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)); |
238 |
< |
} finally { |
239 |
< |
joinPool(p); |
242 |
> |
assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS)); |
243 |
|
} |
244 |
|
} |
245 |
|
|
252 |
|
new CustomTPE(2, 2, |
253 |
|
LONG_DELAY_MS, MILLISECONDS, |
254 |
|
new ArrayBlockingQueue<Runnable>(10)); |
255 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
256 |
< |
final CountDownLatch done = new CountDownLatch(1); |
257 |
< |
try { |
255 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
256 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
257 |
> |
final CountDownLatch done = new CountDownLatch(1); |
258 |
|
assertEquals(0, p.getActiveCount()); |
259 |
|
p.execute(new CheckedRunnable() { |
260 |
|
public void realRun() throws InterruptedException { |
262 |
|
assertEquals(1, p.getActiveCount()); |
263 |
|
done.await(); |
264 |
|
}}); |
265 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
265 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
266 |
|
assertEquals(1, p.getActiveCount()); |
264 |
– |
} finally { |
267 |
|
done.countDown(); |
266 |
– |
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 |
|
} |
329 |
– |
} finally { |
330 |
– |
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 |
> |
final 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 |
> |
final 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 |
> |
final ThreadFactory threadFactory = new SimpleThreadFactory(); |
384 |
> |
final 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 |
> |
final 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 |
> |
final 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 |
|
|
427 |
|
* getRejectedExecutionHandler returns handler in constructor if not set |
428 |
|
*/ |
429 |
|
public void testGetRejectedExecutionHandler() { |
430 |
< |
RejectedExecutionHandler h = new NoOpREHandler(); |
431 |
< |
ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h); |
432 |
< |
assertSame(h, p.getRejectedExecutionHandler()); |
433 |
< |
joinPool(p); |
430 |
> |
final RejectedExecutionHandler handler = new NoOpREHandler(); |
431 |
> |
final ThreadPoolExecutor p = |
432 |
> |
new CustomTPE(1, 2, |
433 |
> |
LONG_DELAY_MS, MILLISECONDS, |
434 |
> |
new ArrayBlockingQueue<Runnable>(10), |
435 |
> |
handler); |
436 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
437 |
> |
assertSame(handler, p.getRejectedExecutionHandler()); |
438 |
> |
} |
439 |
|
} |
440 |
|
|
441 |
|
/** |
443 |
|
* getRejectedExecutionHandler |
444 |
|
*/ |
445 |
|
public void testSetRejectedExecutionHandler() { |
446 |
< |
ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
447 |
< |
RejectedExecutionHandler h = new NoOpREHandler(); |
448 |
< |
p.setRejectedExecutionHandler(h); |
449 |
< |
assertSame(h, p.getRejectedExecutionHandler()); |
450 |
< |
joinPool(p); |
446 |
> |
final ThreadPoolExecutor p = |
447 |
> |
new CustomTPE(1, 2, |
448 |
> |
LONG_DELAY_MS, MILLISECONDS, |
449 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
450 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
451 |
> |
RejectedExecutionHandler handler = new NoOpREHandler(); |
452 |
> |
p.setRejectedExecutionHandler(handler); |
453 |
> |
assertSame(handler, p.getRejectedExecutionHandler()); |
454 |
> |
} |
455 |
|
} |
456 |
|
|
457 |
|
/** |
458 |
|
* setRejectedExecutionHandler(null) throws NPE |
459 |
|
*/ |
460 |
|
public void testSetRejectedExecutionHandlerNull() { |
461 |
< |
ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
462 |
< |
try { |
463 |
< |
p.setRejectedExecutionHandler(null); |
464 |
< |
shouldThrow(); |
465 |
< |
} catch (NullPointerException success) { |
466 |
< |
} finally { |
467 |
< |
joinPool(p); |
461 |
> |
final ThreadPoolExecutor p = |
462 |
> |
new CustomTPE(1, 2, |
463 |
> |
LONG_DELAY_MS, MILLISECONDS, |
464 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
465 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
466 |
> |
try { |
467 |
> |
p.setRejectedExecutionHandler(null); |
468 |
> |
shouldThrow(); |
469 |
> |
} catch (NullPointerException success) {} |
470 |
|
} |
471 |
|
} |
472 |
|
|
480 |
|
new CustomTPE(THREADS, THREADS, |
481 |
|
LONG_DELAY_MS, MILLISECONDS, |
482 |
|
new ArrayBlockingQueue<Runnable>(10)); |
483 |
< |
final CountDownLatch threadsStarted = new CountDownLatch(THREADS); |
484 |
< |
final CountDownLatch done = new CountDownLatch(1); |
485 |
< |
try { |
483 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
484 |
> |
final CountDownLatch threadsStarted = new CountDownLatch(THREADS); |
485 |
> |
final CountDownLatch done = new CountDownLatch(1); |
486 |
|
assertEquals(0, p.getLargestPoolSize()); |
487 |
|
for (int i = 0; i < THREADS; i++) |
488 |
|
p.execute(new CheckedRunnable() { |
491 |
|
done.await(); |
492 |
|
assertEquals(THREADS, p.getLargestPoolSize()); |
493 |
|
}}); |
494 |
< |
assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
445 |
< |
assertEquals(THREADS, p.getLargestPoolSize()); |
446 |
< |
} finally { |
447 |
< |
done.countDown(); |
448 |
< |
joinPool(p); |
494 |
> |
assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
495 |
|
assertEquals(THREADS, p.getLargestPoolSize()); |
496 |
+ |
done.countDown(); // release pool |
497 |
|
} |
498 |
+ |
assertEquals(THREADS, p.getLargestPoolSize()); |
499 |
|
} |
500 |
|
|
501 |
|
/** |
503 |
|
* otherwise set |
504 |
|
*/ |
505 |
|
public void testGetMaximumPoolSize() { |
506 |
< |
ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
507 |
< |
assertEquals(2, p.getMaximumPoolSize()); |
508 |
< |
joinPool(p); |
506 |
> |
final ThreadPoolExecutor p = |
507 |
> |
new CustomTPE(2, 3, |
508 |
> |
LONG_DELAY_MS, MILLISECONDS, |
509 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
510 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
511 |
> |
assertEquals(3, p.getMaximumPoolSize()); |
512 |
> |
p.setMaximumPoolSize(5); |
513 |
> |
assertEquals(5, p.getMaximumPoolSize()); |
514 |
> |
p.setMaximumPoolSize(4); |
515 |
> |
assertEquals(4, p.getMaximumPoolSize()); |
516 |
> |
} |
517 |
|
} |
518 |
|
|
519 |
|
/** |
525 |
|
new CustomTPE(1, 1, |
526 |
|
LONG_DELAY_MS, MILLISECONDS, |
527 |
|
new ArrayBlockingQueue<Runnable>(10)); |
528 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
529 |
< |
final CountDownLatch done = new CountDownLatch(1); |
530 |
< |
try { |
528 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
529 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
530 |
> |
final CountDownLatch done = new CountDownLatch(1); |
531 |
|
assertEquals(0, p.getPoolSize()); |
532 |
|
p.execute(new CheckedRunnable() { |
533 |
|
public void realRun() throws InterruptedException { |
535 |
|
assertEquals(1, p.getPoolSize()); |
536 |
|
done.await(); |
537 |
|
}}); |
538 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
538 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
539 |
|
assertEquals(1, p.getPoolSize()); |
540 |
< |
} finally { |
485 |
< |
done.countDown(); |
486 |
< |
joinPool(p); |
540 |
> |
done.countDown(); // release pool |
541 |
|
} |
542 |
|
} |
543 |
|
|
549 |
|
new CustomTPE(1, 1, |
550 |
|
LONG_DELAY_MS, MILLISECONDS, |
551 |
|
new ArrayBlockingQueue<Runnable>(10)); |
552 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
553 |
< |
final CountDownLatch done = new CountDownLatch(1); |
554 |
< |
try { |
552 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
553 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
554 |
> |
final CountDownLatch done = new CountDownLatch(1); |
555 |
|
assertEquals(0, p.getTaskCount()); |
556 |
|
p.execute(new CheckedRunnable() { |
557 |
|
public void realRun() throws InterruptedException { |
559 |
|
assertEquals(1, p.getTaskCount()); |
560 |
|
done.await(); |
561 |
|
}}); |
562 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
562 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
563 |
|
assertEquals(1, p.getTaskCount()); |
510 |
– |
} finally { |
564 |
|
done.countDown(); |
512 |
– |
joinPool(p); |
565 |
|
} |
566 |
|
} |
567 |
|
|
569 |
|
* isShutdown is false before shutdown, true after |
570 |
|
*/ |
571 |
|
public void testIsShutdown() { |
572 |
< |
|
573 |
< |
ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
574 |
< |
assertFalse(p.isShutdown()); |
575 |
< |
try { p.shutdown(); } catch (SecurityException ok) { return; } |
576 |
< |
assertTrue(p.isShutdown()); |
577 |
< |
joinPool(p); |
572 |
> |
final ThreadPoolExecutor p = |
573 |
> |
new CustomTPE(1, 1, |
574 |
> |
LONG_DELAY_MS, MILLISECONDS, |
575 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
576 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
577 |
> |
assertFalse(p.isShutdown()); |
578 |
> |
try { p.shutdown(); } catch (SecurityException ok) { return; } |
579 |
> |
assertTrue(p.isShutdown()); |
580 |
> |
} |
581 |
|
} |
582 |
|
|
583 |
|
/** |
588 |
|
new CustomTPE(1, 1, |
589 |
|
LONG_DELAY_MS, MILLISECONDS, |
590 |
|
new ArrayBlockingQueue<Runnable>(10)); |
591 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
592 |
< |
final CountDownLatch done = new CountDownLatch(1); |
593 |
< |
try { |
591 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
592 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
593 |
> |
final CountDownLatch done = new CountDownLatch(1); |
594 |
|
assertFalse(p.isTerminating()); |
595 |
|
p.execute(new CheckedRunnable() { |
596 |
|
public void realRun() throws InterruptedException { |
598 |
|
threadStarted.countDown(); |
599 |
|
done.await(); |
600 |
|
}}); |
601 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
601 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
602 |
|
assertFalse(p.isTerminating()); |
603 |
|
done.countDown(); |
549 |
– |
} finally { |
604 |
|
try { p.shutdown(); } catch (SecurityException ok) { return; } |
605 |
+ |
assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
606 |
+ |
assertTrue(p.isTerminated()); |
607 |
+ |
assertFalse(p.isTerminating()); |
608 |
|
} |
552 |
– |
assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
553 |
– |
assertTrue(p.isTerminated()); |
554 |
– |
assertFalse(p.isTerminating()); |
609 |
|
} |
610 |
|
|
611 |
|
/** |
616 |
|
new CustomTPE(1, 1, |
617 |
|
LONG_DELAY_MS, MILLISECONDS, |
618 |
|
new ArrayBlockingQueue<Runnable>(10)); |
619 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
620 |
< |
final CountDownLatch done = new CountDownLatch(1); |
621 |
< |
try { |
619 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
620 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
621 |
> |
final CountDownLatch done = new CountDownLatch(1); |
622 |
|
assertFalse(p.isTerminating()); |
623 |
|
p.execute(new CheckedRunnable() { |
624 |
|
public void realRun() throws InterruptedException { |
626 |
|
threadStarted.countDown(); |
627 |
|
done.await(); |
628 |
|
}}); |
629 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
629 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
630 |
|
assertFalse(p.isTerminating()); |
631 |
|
done.countDown(); |
578 |
– |
} finally { |
632 |
|
try { p.shutdown(); } catch (SecurityException ok) { return; } |
633 |
+ |
assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
634 |
+ |
assertTrue(p.isTerminated()); |
635 |
+ |
assertFalse(p.isTerminating()); |
636 |
|
} |
581 |
– |
assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
582 |
– |
assertTrue(p.isTerminated()); |
583 |
– |
assertFalse(p.isTerminating()); |
637 |
|
} |
638 |
|
|
639 |
|
/** |
645 |
|
new CustomTPE(1, 1, |
646 |
|
LONG_DELAY_MS, MILLISECONDS, |
647 |
|
q); |
648 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
649 |
< |
final CountDownLatch done = new CountDownLatch(1); |
650 |
< |
try { |
648 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
649 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
650 |
> |
final CountDownLatch done = new CountDownLatch(1); |
651 |
|
FutureTask[] tasks = new FutureTask[5]; |
652 |
|
for (int i = 0; i < tasks.length; i++) { |
653 |
|
Callable task = new CheckedCallable<Boolean>() { |
660 |
|
tasks[i] = new FutureTask(task); |
661 |
|
p.execute(tasks[i]); |
662 |
|
} |
663 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
663 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
664 |
|
assertSame(q, p.getQueue()); |
665 |
|
assertFalse(q.contains(tasks[0])); |
666 |
|
assertTrue(q.contains(tasks[tasks.length - 1])); |
667 |
|
assertEquals(tasks.length - 1, q.size()); |
615 |
– |
} finally { |
668 |
|
done.countDown(); |
617 |
– |
joinPool(p); |
669 |
|
} |
670 |
|
} |
671 |
|
|
678 |
|
new CustomTPE(1, 1, |
679 |
|
LONG_DELAY_MS, MILLISECONDS, |
680 |
|
q); |
681 |
< |
Runnable[] tasks = new Runnable[6]; |
682 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
683 |
< |
final CountDownLatch done = new CountDownLatch(1); |
684 |
< |
try { |
681 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
682 |
> |
Runnable[] tasks = new Runnable[6]; |
683 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
684 |
> |
final CountDownLatch done = new CountDownLatch(1); |
685 |
|
for (int i = 0; i < tasks.length; i++) { |
686 |
|
tasks[i] = new CheckedRunnable() { |
687 |
< |
public void realRun() throws InterruptedException { |
688 |
< |
threadStarted.countDown(); |
689 |
< |
done.await(); |
690 |
< |
}}; |
687 |
> |
public void realRun() throws InterruptedException { |
688 |
> |
threadStarted.countDown(); |
689 |
> |
done.await(); |
690 |
> |
}}; |
691 |
|
p.execute(tasks[i]); |
692 |
|
} |
693 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
693 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
694 |
|
assertFalse(p.remove(tasks[0])); |
695 |
|
assertTrue(q.contains(tasks[4])); |
696 |
|
assertTrue(q.contains(tasks[3])); |
700 |
|
assertTrue(q.contains(tasks[3])); |
701 |
|
assertTrue(p.remove(tasks[3])); |
702 |
|
assertFalse(q.contains(tasks[3])); |
652 |
– |
} finally { |
703 |
|
done.countDown(); |
654 |
– |
joinPool(p); |
704 |
|
} |
705 |
|
} |
706 |
|
|
715 |
|
new CustomTPE(1, 1, |
716 |
|
LONG_DELAY_MS, MILLISECONDS, |
717 |
|
q); |
718 |
< |
FutureTask[] tasks = new FutureTask[5]; |
719 |
< |
try { |
718 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
719 |
> |
FutureTask[] tasks = new FutureTask[5]; |
720 |
|
for (int i = 0; i < tasks.length; i++) { |
721 |
|
Callable task = new CheckedCallable<Boolean>() { |
722 |
|
public Boolean realCall() throws InterruptedException { |
727 |
|
tasks[i] = new FutureTask(task); |
728 |
|
p.execute(tasks[i]); |
729 |
|
} |
730 |
< |
assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS)); |
730 |
> |
assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS)); |
731 |
|
assertEquals(tasks.length, p.getTaskCount()); |
732 |
|
assertEquals(tasks.length - 1, q.size()); |
733 |
|
assertEquals(1L, p.getActiveCount()); |
740 |
|
p.purge(); // Nothing to do |
741 |
|
assertEquals(tasks.length - 3, q.size()); |
742 |
|
assertEquals(tasks.length - 2, p.getTaskCount()); |
694 |
– |
} finally { |
743 |
|
done.countDown(); |
696 |
– |
joinPool(p); |
744 |
|
} |
745 |
|
} |
746 |
|
|
747 |
|
/** |
748 |
< |
* shutdownNow returns a list containing tasks that were not run |
748 |
> |
* shutdownNow returns a list containing tasks that were not run, |
749 |
> |
* and those tasks are drained from the queue |
750 |
|
*/ |
751 |
< |
public void testShutdownNow() { |
752 |
< |
ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
753 |
< |
List l; |
754 |
< |
try { |
755 |
< |
for (int i = 0; i < 5; i++) |
756 |
< |
p.execute(new MediumPossiblyInterruptedRunnable()); |
757 |
< |
} |
758 |
< |
finally { |
751 |
> |
public void testShutdownNow() throws InterruptedException { |
752 |
> |
final int poolSize = 2; |
753 |
> |
final int count = 5; |
754 |
> |
final AtomicInteger ran = new AtomicInteger(0); |
755 |
> |
ThreadPoolExecutor p = |
756 |
> |
new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS, |
757 |
> |
new ArrayBlockingQueue<Runnable>(10)); |
758 |
> |
CountDownLatch threadsStarted = new CountDownLatch(poolSize); |
759 |
> |
Runnable waiter = new CheckedRunnable() { public void realRun() { |
760 |
> |
threadsStarted.countDown(); |
761 |
|
try { |
762 |
< |
l = p.shutdownNow(); |
763 |
< |
} catch (SecurityException ok) { return; } |
762 |
> |
MILLISECONDS.sleep(2 * LONG_DELAY_MS); |
763 |
> |
} catch (InterruptedException success) {} |
764 |
> |
ran.getAndIncrement(); |
765 |
> |
}}; |
766 |
> |
for (int i = 0; i < count; i++) |
767 |
> |
p.execute(waiter); |
768 |
> |
assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS)); |
769 |
> |
assertEquals(poolSize, p.getActiveCount()); |
770 |
> |
assertEquals(0, p.getCompletedTaskCount()); |
771 |
> |
final List<Runnable> queuedTasks; |
772 |
> |
try { |
773 |
> |
queuedTasks = p.shutdownNow(); |
774 |
> |
} catch (SecurityException ok) { |
775 |
> |
return; // Allowed in case test doesn't have privs |
776 |
|
} |
777 |
|
assertTrue(p.isShutdown()); |
778 |
< |
assertTrue(l.size() <= 4); |
778 |
> |
assertTrue(p.getQueue().isEmpty()); |
779 |
> |
assertEquals(count - poolSize, queuedTasks.size()); |
780 |
> |
assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
781 |
> |
assertTrue(p.isTerminated()); |
782 |
> |
assertEquals(poolSize, ran.get()); |
783 |
> |
assertEquals(poolSize, p.getCompletedTaskCount()); |
784 |
|
} |
785 |
|
|
786 |
|
// Exception Tests |
1124 |
|
* execute throws RejectedExecutionException if saturated. |
1125 |
|
*/ |
1126 |
|
public void testSaturatedExecute() { |
1127 |
< |
ThreadPoolExecutor p = |
1127 |
> |
final ThreadPoolExecutor p = |
1128 |
|
new CustomTPE(1, 1, |
1129 |
|
LONG_DELAY_MS, MILLISECONDS, |
1130 |
|
new ArrayBlockingQueue<Runnable>(1)); |
1131 |
< |
final CountDownLatch done = new CountDownLatch(1); |
1132 |
< |
try { |
1131 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
1132 |
> |
final CountDownLatch done = new CountDownLatch(1); |
1133 |
|
Runnable task = new CheckedRunnable() { |
1134 |
|
public void realRun() throws InterruptedException { |
1135 |
|
done.await(); |
1143 |
|
} catch (RejectedExecutionException success) {} |
1144 |
|
assertTrue(p.getTaskCount() <= 2); |
1145 |
|
} |
1079 |
– |
} finally { |
1146 |
|
done.countDown(); |
1081 |
– |
joinPool(p); |
1147 |
|
} |
1148 |
|
} |
1149 |
|
|
1787 |
|
l.add(new StringTask()); |
1788 |
|
l.add(new StringTask()); |
1789 |
|
List<Future<String>> futures = |
1790 |
< |
e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); |
1790 |
> |
e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS); |
1791 |
|
assertEquals(2, futures.size()); |
1792 |
|
for (Future<String> future : futures) |
1793 |
|
assertSame(TEST_STRING, future.get()); |
1802 |
|
public void testTimedInvokeAll6() throws Exception { |
1803 |
|
ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
1804 |
|
try { |
1805 |
< |
List<Callable<String>> l = new ArrayList<Callable<String>>(); |
1806 |
< |
l.add(new StringTask()); |
1807 |
< |
l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING)); |
1808 |
< |
l.add(new StringTask()); |
1809 |
< |
List<Future<String>> futures = |
1810 |
< |
e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS); |
1811 |
< |
assertEquals(l.size(), futures.size()); |
1812 |
< |
for (Future future : futures) |
1813 |
< |
assertTrue(future.isDone()); |
1814 |
< |
assertFalse(futures.get(0).isCancelled()); |
1815 |
< |
assertTrue(futures.get(1).isCancelled()); |
1805 |
> |
for (long timeout = timeoutMillis();;) { |
1806 |
> |
List<Callable<String>> tasks = new ArrayList<>(); |
1807 |
> |
tasks.add(new StringTask("0")); |
1808 |
> |
tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING)); |
1809 |
> |
tasks.add(new StringTask("2")); |
1810 |
> |
long startTime = System.nanoTime(); |
1811 |
> |
List<Future<String>> futures = |
1812 |
> |
e.invokeAll(tasks, timeout, MILLISECONDS); |
1813 |
> |
assertEquals(tasks.size(), futures.size()); |
1814 |
> |
assertTrue(millisElapsedSince(startTime) >= timeout); |
1815 |
> |
for (Future future : futures) |
1816 |
> |
assertTrue(future.isDone()); |
1817 |
> |
assertTrue(futures.get(1).isCancelled()); |
1818 |
> |
try { |
1819 |
> |
assertEquals("0", futures.get(0).get()); |
1820 |
> |
assertEquals("2", futures.get(2).get()); |
1821 |
> |
break; |
1822 |
> |
} catch (CancellationException retryWithLongerTimeout) { |
1823 |
> |
timeout *= 2; |
1824 |
> |
if (timeout >= LONG_DELAY_MS / 2) |
1825 |
> |
fail("expected exactly one task to be cancelled"); |
1826 |
> |
} |
1827 |
> |
} |
1828 |
|
} finally { |
1829 |
|
joinPool(e); |
1830 |
|
} |
1867 |
|
* allowCoreThreadTimeOut(true) causes idle threads to time out |
1868 |
|
*/ |
1869 |
|
public void testAllowCoreThreadTimeOut_true() throws Exception { |
1870 |
< |
long coreThreadTimeOut = SHORT_DELAY_MS; |
1870 |
> |
long keepAliveTime = timeoutMillis(); |
1871 |
|
final ThreadPoolExecutor p = |
1872 |
|
new CustomTPE(2, 10, |
1873 |
< |
coreThreadTimeOut, MILLISECONDS, |
1873 |
> |
keepAliveTime, MILLISECONDS, |
1874 |
|
new ArrayBlockingQueue<Runnable>(10)); |
1875 |
|
final CountDownLatch threadStarted = new CountDownLatch(1); |
1876 |
|
try { |
1877 |
|
p.allowCoreThreadTimeOut(true); |
1878 |
|
p.execute(new CheckedRunnable() { |
1879 |
< |
public void realRun() throws InterruptedException { |
1879 |
> |
public void realRun() { |
1880 |
|
threadStarted.countDown(); |
1881 |
|
assertEquals(1, p.getPoolSize()); |
1882 |
|
}}); |
1883 |
|
await(threadStarted); |
1884 |
< |
delay(coreThreadTimeOut); |
1884 |
> |
delay(keepAliveTime); |
1885 |
|
long startTime = System.nanoTime(); |
1886 |
|
while (p.getPoolSize() > 0 |
1887 |
|
&& millisElapsedSince(startTime) < LONG_DELAY_MS) |
1897 |
|
* allowCoreThreadTimeOut(false) causes idle threads not to time out |
1898 |
|
*/ |
1899 |
|
public void testAllowCoreThreadTimeOut_false() throws Exception { |
1900 |
< |
long coreThreadTimeOut = SHORT_DELAY_MS; |
1900 |
> |
long keepAliveTime = timeoutMillis(); |
1901 |
|
final ThreadPoolExecutor p = |
1902 |
|
new CustomTPE(2, 10, |
1903 |
< |
coreThreadTimeOut, MILLISECONDS, |
1903 |
> |
keepAliveTime, MILLISECONDS, |
1904 |
|
new ArrayBlockingQueue<Runnable>(10)); |
1905 |
|
final CountDownLatch threadStarted = new CountDownLatch(1); |
1906 |
|
try { |
1910 |
|
threadStarted.countDown(); |
1911 |
|
assertTrue(p.getPoolSize() >= 1); |
1912 |
|
}}); |
1913 |
< |
delay(2 * coreThreadTimeOut); |
1913 |
> |
delay(2 * keepAliveTime); |
1914 |
|
assertTrue(p.getPoolSize() >= 1); |
1915 |
|
} finally { |
1916 |
|
joinPool(p); |
1917 |
|
} |
1918 |
|
} |
1919 |
|
|
1920 |
+ |
/** |
1921 |
+ |
* get(cancelled task) throws CancellationException |
1922 |
+ |
* (in part, a test of CustomTPE itself) |
1923 |
+ |
*/ |
1924 |
+ |
public void testGet_cancelled() throws Exception { |
1925 |
+ |
final ExecutorService e = |
1926 |
+ |
new CustomTPE(1, 1, |
1927 |
+ |
LONG_DELAY_MS, MILLISECONDS, |
1928 |
+ |
new LinkedBlockingQueue<Runnable>()); |
1929 |
+ |
try { |
1930 |
+ |
final CountDownLatch blockerStarted = new CountDownLatch(1); |
1931 |
+ |
final CountDownLatch done = new CountDownLatch(1); |
1932 |
+ |
final List<Future<?>> futures = new ArrayList<>(); |
1933 |
+ |
for (int i = 0; i < 2; i++) { |
1934 |
+ |
Runnable r = new CheckedRunnable() { public void realRun() |
1935 |
+ |
throws Throwable { |
1936 |
+ |
blockerStarted.countDown(); |
1937 |
+ |
assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS)); |
1938 |
+ |
}}; |
1939 |
+ |
futures.add(e.submit(r)); |
1940 |
+ |
} |
1941 |
+ |
assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS)); |
1942 |
+ |
for (Future<?> future : futures) future.cancel(false); |
1943 |
+ |
for (Future<?> future : futures) { |
1944 |
+ |
try { |
1945 |
+ |
future.get(); |
1946 |
+ |
shouldThrow(); |
1947 |
+ |
} catch (CancellationException success) {} |
1948 |
+ |
try { |
1949 |
+ |
future.get(LONG_DELAY_MS, MILLISECONDS); |
1950 |
+ |
shouldThrow(); |
1951 |
+ |
} catch (CancellationException success) {} |
1952 |
+ |
assertTrue(future.isCancelled()); |
1953 |
+ |
assertTrue(future.isDone()); |
1954 |
+ |
} |
1955 |
+ |
done.countDown(); |
1956 |
+ |
} finally { |
1957 |
+ |
joinPool(e); |
1958 |
+ |
} |
1959 |
+ |
} |
1960 |
+ |
|
1961 |
|
} |