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 |
+ |
PoolCleaner cleaner(ExecutorService pool) { |
780 |
+ |
return new PoolCleaner(pool); |
781 |
+ |
} |
782 |
+ |
|
783 |
|
/** |
784 |
|
* Waits out termination of a thread pool or fails doing so. |
785 |
|
*/ |
812 |
|
* necessarily individually slow because they must block. |
813 |
|
*/ |
814 |
|
void testInParallel(Action ... actions) { |
815 |
< |
try (PoolCloser<ExecutorService> poolCloser |
816 |
< |
= new PoolCloser<>(Executors.newCachedThreadPool())) { |
814 |
< |
ExecutorService pool = poolCloser.pool; |
815 |
> |
ExecutorService pool = Executors.newCachedThreadPool(); |
816 |
> |
try (PoolCleaner cleaner = cleaner(pool)) { |
817 |
|
ArrayList<Future<?>> futures = new ArrayList<>(actions.length); |
818 |
|
for (final Action action : actions) |
819 |
|
futures.add(pool.submit(new CheckedRunnable() { |
1318 |
|
}}; |
1319 |
|
} |
1320 |
|
|
1321 |
< |
public Runnable awaiter(final CountDownLatch latch) { |
1322 |
< |
return new CheckedRunnable() { |
1323 |
< |
public void realRun() throws InterruptedException { |
1324 |
< |
await(latch); |
1325 |
< |
}}; |
1321 |
> |
class LatchAwaiter extends CheckedRunnable { |
1322 |
> |
static final int NEW = 0; |
1323 |
> |
static final int RUNNING = 1; |
1324 |
> |
static final int DONE = 2; |
1325 |
> |
final CountDownLatch latch; |
1326 |
> |
int state = NEW; |
1327 |
> |
LatchAwaiter(CountDownLatch latch) { this.latch = latch; } |
1328 |
> |
public void realRun() throws InterruptedException { |
1329 |
> |
state = 1; |
1330 |
> |
await(latch); |
1331 |
> |
state = 2; |
1332 |
> |
} |
1333 |
> |
} |
1334 |
> |
|
1335 |
> |
public LatchAwaiter awaiter(CountDownLatch latch) { |
1336 |
> |
return new LatchAwaiter(latch); |
1337 |
|
} |
1338 |
|
|
1339 |
|
public void await(CountDownLatch latch) { |