| 201 |
|
("Looks like we're stuck running test: " |
| 202 |
|
+ lastTestCase); |
| 203 |
|
dumpTestThreads(); |
| 204 |
+ |
// one stack dump is probably enough; more would be spam |
| 205 |
+ |
break; |
| 206 |
|
} |
| 207 |
|
lastTestCase = currentTestCase; |
| 208 |
|
}}}; |
| 592 |
|
} |
| 593 |
|
|
| 594 |
|
/** |
| 595 |
< |
* Finds missing try { ... } finally { joinPool(e); } |
| 595 |
> |
* Finds missing PoolCleaners |
| 596 |
|
*/ |
| 597 |
|
void checkForkJoinPoolThreadLeaks() throws InterruptedException { |
| 598 |
|
Thread[] survivors = new Thread[7]; |
| 751 |
|
/** |
| 752 |
|
* Delays, via Thread.sleep, for the given millisecond delay, but |
| 753 |
|
* if the sleep is shorter than specified, may re-sleep or yield |
| 754 |
< |
* until time elapses. |
| 754 |
> |
* until time elapses. Ensures that the given time, as measured |
| 755 |
> |
* by System.nanoTime(), has elapsed. |
| 756 |
|
*/ |
| 757 |
|
static void delay(long millis) throws InterruptedException { |
| 758 |
< |
long startTime = System.nanoTime(); |
| 759 |
< |
long ns = millis * 1000 * 1000; |
| 760 |
< |
for (;;) { |
| 758 |
> |
long nanos = millis * (1000 * 1000); |
| 759 |
> |
final long wakeupTime = System.nanoTime() + nanos; |
| 760 |
> |
do { |
| 761 |
|
if (millis > 0L) |
| 762 |
|
Thread.sleep(millis); |
| 763 |
|
else // too short to sleep |
| 764 |
|
Thread.yield(); |
| 765 |
< |
long d = ns - (System.nanoTime() - startTime); |
| 766 |
< |
if (d > 0L) |
| 767 |
< |
millis = d / (1000 * 1000); |
| 765 |
< |
else |
| 766 |
< |
break; |
| 767 |
< |
} |
| 765 |
> |
nanos = wakeupTime - System.nanoTime(); |
| 766 |
> |
millis = nanos / (1000 * 1000); |
| 767 |
> |
} while (nanos >= 0L); |
| 768 |
|
} |
| 769 |
|
|
| 770 |
|
/** |
| 771 |
|
* Allows use of try-with-resources with per-test thread pools. |
| 772 |
|
*/ |
| 773 |
< |
class PoolCloser<T extends ExecutorService> |
| 774 |
< |
implements AutoCloseable { |
| 775 |
< |
public final T pool; |
| 776 |
< |
public PoolCloser(T pool) { this.pool = pool; } |
| 773 |
> |
class PoolCleaner implements AutoCloseable { |
| 774 |
> |
private final ExecutorService pool; |
| 775 |
> |
public PoolCleaner(ExecutorService pool) { this.pool = pool; } |
| 776 |
|
public void close() { joinPool(pool); } |
| 777 |
|
} |
| 778 |
|
|
| 779 |
|
/** |
| 780 |
+ |
* An extension of PoolCleaner that has an action to release the pool. |
| 781 |
+ |
*/ |
| 782 |
+ |
class PoolCleanerWithReleaser extends PoolCleaner { |
| 783 |
+ |
private final Runnable releaser; |
| 784 |
+ |
public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) { |
| 785 |
+ |
super(pool); |
| 786 |
+ |
this.releaser = releaser; |
| 787 |
+ |
} |
| 788 |
+ |
public void close() { |
| 789 |
+ |
try { |
| 790 |
+ |
releaser.run(); |
| 791 |
+ |
} finally { |
| 792 |
+ |
super.close(); |
| 793 |
+ |
} |
| 794 |
+ |
} |
| 795 |
+ |
} |
| 796 |
+ |
|
| 797 |
+ |
PoolCleaner cleaner(ExecutorService pool) { |
| 798 |
+ |
return new PoolCleaner(pool); |
| 799 |
+ |
} |
| 800 |
+ |
|
| 801 |
+ |
PoolCleaner cleaner(ExecutorService pool, Runnable releaser) { |
| 802 |
+ |
return new PoolCleanerWithReleaser(pool, releaser); |
| 803 |
+ |
} |
| 804 |
+ |
|
| 805 |
+ |
PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) { |
| 806 |
+ |
return new PoolCleanerWithReleaser(pool, releaser(latch)); |
| 807 |
+ |
} |
| 808 |
+ |
|
| 809 |
+ |
Runnable releaser(final CountDownLatch latch) { |
| 810 |
+ |
return new Runnable() { public void run() { |
| 811 |
+ |
do { latch.countDown(); } |
| 812 |
+ |
while (latch.getCount() > 0); |
| 813 |
+ |
}}; |
| 814 |
+ |
} |
| 815 |
+ |
|
| 816 |
+ |
/** |
| 817 |
|
* Waits out termination of a thread pool or fails doing so. |
| 818 |
|
*/ |
| 819 |
|
void joinPool(ExecutorService pool) { |
| 826 |
|
} finally { |
| 827 |
|
// last resort, for the benefit of subsequent tests |
| 828 |
|
pool.shutdownNow(); |
| 829 |
< |
pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS); |
| 829 |
> |
pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS); |
| 830 |
|
} |
| 831 |
|
} |
| 832 |
|
} catch (SecurityException ok) { |
| 845 |
|
* necessarily individually slow because they must block. |
| 846 |
|
*/ |
| 847 |
|
void testInParallel(Action ... actions) { |
| 848 |
< |
try (PoolCloser<ExecutorService> poolCloser |
| 849 |
< |
= new PoolCloser<>(Executors.newCachedThreadPool())) { |
| 814 |
< |
ExecutorService pool = poolCloser.pool; |
| 848 |
> |
ExecutorService pool = Executors.newCachedThreadPool(); |
| 849 |
> |
try (PoolCleaner cleaner = cleaner(pool)) { |
| 850 |
|
ArrayList<Future<?>> futures = new ArrayList<>(actions.length); |
| 851 |
|
for (final Action action : actions) |
| 852 |
|
futures.add(pool.submit(new CheckedRunnable() { |
| 1203 |
|
} finally { |
| 1204 |
|
if (t.getState() != Thread.State.TERMINATED) { |
| 1205 |
|
t.interrupt(); |
| 1206 |
< |
fail("Test timed out"); |
| 1206 |
> |
threadFail("Test timed out"); |
| 1207 |
|
} |
| 1208 |
|
} |
| 1209 |
|
} |
| 1351 |
|
}}; |
| 1352 |
|
} |
| 1353 |
|
|
| 1354 |
< |
public Runnable awaiter(final CountDownLatch latch) { |
| 1355 |
< |
return new CheckedRunnable() { |
| 1356 |
< |
public void realRun() throws InterruptedException { |
| 1357 |
< |
await(latch); |
| 1358 |
< |
}}; |
| 1354 |
> |
class LatchAwaiter extends CheckedRunnable { |
| 1355 |
> |
static final int NEW = 0; |
| 1356 |
> |
static final int RUNNING = 1; |
| 1357 |
> |
static final int DONE = 2; |
| 1358 |
> |
final CountDownLatch latch; |
| 1359 |
> |
int state = NEW; |
| 1360 |
> |
LatchAwaiter(CountDownLatch latch) { this.latch = latch; } |
| 1361 |
> |
public void realRun() throws InterruptedException { |
| 1362 |
> |
state = 1; |
| 1363 |
> |
await(latch); |
| 1364 |
> |
state = 2; |
| 1365 |
> |
} |
| 1366 |
> |
} |
| 1367 |
> |
|
| 1368 |
> |
public LatchAwaiter awaiter(CountDownLatch latch) { |
| 1369 |
> |
return new LatchAwaiter(latch); |
| 1370 |
|
} |
| 1371 |
|
|
| 1372 |
|
public void await(CountDownLatch latch) { |
