188 |
|
return (regex == null) ? null : Pattern.compile(regex); |
189 |
|
} |
190 |
|
|
191 |
+ |
// Instrumentation to debug very rare, but very annoying hung test runs. |
192 |
|
static volatile TestCase currentTestCase; |
193 |
+ |
static volatile int currentRun = 0; |
194 |
|
static { |
195 |
|
Runnable checkForWedgedTest = new Runnable() { public void run() { |
196 |
|
// avoid spurious reports with enormous runsPerTest |
199 |
|
try { MINUTES.sleep(timeoutMinutes); } |
200 |
|
catch (InterruptedException unexpected) { break; } |
201 |
|
if (lastTestCase == currentTestCase) { |
202 |
+ |
System.err.printf( |
203 |
+ |
"Looks like we're stuck running test: %s (%d/%d)%n", |
204 |
+ |
lastTestCase, currentRun, runsPerTest); |
205 |
|
System.err.println |
206 |
|
("Looks like we're stuck running test: " |
207 |
< |
+ lastTestCase); |
207 |
> |
+ lastTestCase + " (" + currentRun + "/" + runsPerTest + ")"); |
208 |
> |
System.err.println("availableProcessors=" + |
209 |
> |
Runtime.getRuntime().availableProcessors()); |
210 |
|
dumpTestThreads(); |
211 |
+ |
// one stack dump is probably enough; more would be spam |
212 |
+ |
break; |
213 |
|
} |
214 |
|
lastTestCase = currentTestCase; |
215 |
|
}}}; |
227 |
|
|
228 |
|
protected void runTest() throws Throwable { |
229 |
|
for (int i = 0; i < runsPerTest; i++) { |
230 |
+ |
currentRun = i; |
231 |
|
if (profileTests) |
232 |
|
runTestProfiled(); |
233 |
|
else |
600 |
|
} |
601 |
|
|
602 |
|
/** |
603 |
< |
* Finds missing try { ... } finally { joinPool(e); } |
603 |
> |
* Finds missing PoolCleaners |
604 |
|
*/ |
605 |
|
void checkForkJoinPoolThreadLeaks() throws InterruptedException { |
606 |
|
Thread[] survivors = new Thread[7]; |
759 |
|
/** |
760 |
|
* Delays, via Thread.sleep, for the given millisecond delay, but |
761 |
|
* if the sleep is shorter than specified, may re-sleep or yield |
762 |
< |
* until time elapses. |
762 |
> |
* until time elapses. Ensures that the given time, as measured |
763 |
> |
* by System.nanoTime(), has elapsed. |
764 |
|
*/ |
765 |
|
static void delay(long millis) throws InterruptedException { |
766 |
< |
long startTime = System.nanoTime(); |
767 |
< |
long ns = millis * 1000 * 1000; |
768 |
< |
for (;;) { |
766 |
> |
long nanos = millis * (1000 * 1000); |
767 |
> |
final long wakeupTime = System.nanoTime() + nanos; |
768 |
> |
do { |
769 |
|
if (millis > 0L) |
770 |
|
Thread.sleep(millis); |
771 |
|
else // too short to sleep |
772 |
|
Thread.yield(); |
773 |
< |
long d = ns - (System.nanoTime() - startTime); |
774 |
< |
if (d > 0L) |
775 |
< |
millis = d / (1000 * 1000); |
765 |
< |
else |
766 |
< |
break; |
767 |
< |
} |
773 |
> |
nanos = wakeupTime - System.nanoTime(); |
774 |
> |
millis = nanos / (1000 * 1000); |
775 |
> |
} while (nanos >= 0L); |
776 |
|
} |
777 |
|
|
778 |
|
/** |
784 |
|
public void close() { joinPool(pool); } |
785 |
|
} |
786 |
|
|
787 |
+ |
/** |
788 |
+ |
* An extension of PoolCleaner that has an action to release the pool. |
789 |
+ |
*/ |
790 |
+ |
class PoolCleanerWithReleaser extends PoolCleaner { |
791 |
+ |
private final Runnable releaser; |
792 |
+ |
public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) { |
793 |
+ |
super(pool); |
794 |
+ |
this.releaser = releaser; |
795 |
+ |
} |
796 |
+ |
public void close() { |
797 |
+ |
try { |
798 |
+ |
releaser.run(); |
799 |
+ |
} finally { |
800 |
+ |
super.close(); |
801 |
+ |
} |
802 |
+ |
} |
803 |
+ |
} |
804 |
+ |
|
805 |
|
PoolCleaner cleaner(ExecutorService pool) { |
806 |
|
return new PoolCleaner(pool); |
807 |
|
} |
808 |
|
|
809 |
+ |
PoolCleaner cleaner(ExecutorService pool, Runnable releaser) { |
810 |
+ |
return new PoolCleanerWithReleaser(pool, releaser); |
811 |
+ |
} |
812 |
+ |
|
813 |
+ |
PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) { |
814 |
+ |
return new PoolCleanerWithReleaser(pool, releaser(latch)); |
815 |
+ |
} |
816 |
+ |
|
817 |
+ |
Runnable releaser(final CountDownLatch latch) { |
818 |
+ |
return new Runnable() { public void run() { |
819 |
+ |
do { latch.countDown(); } |
820 |
+ |
while (latch.getCount() > 0); |
821 |
+ |
}}; |
822 |
+ |
} |
823 |
+ |
|
824 |
|
/** |
825 |
|
* Waits out termination of a thread pool or fails doing so. |
826 |
|
*/ |
834 |
|
} finally { |
835 |
|
// last resort, for the benefit of subsequent tests |
836 |
|
pool.shutdownNow(); |
837 |
< |
pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS); |
837 |
> |
pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS); |
838 |
|
} |
839 |
|
} |
840 |
|
} catch (SecurityException ok) { |
1211 |
|
} finally { |
1212 |
|
if (t.getState() != Thread.State.TERMINATED) { |
1213 |
|
t.interrupt(); |
1214 |
< |
fail("Test timed out"); |
1214 |
> |
threadFail("Test timed out"); |
1215 |
|
} |
1216 |
|
} |
1217 |
|
} |
1360 |
|
} |
1361 |
|
|
1362 |
|
class LatchAwaiter extends CheckedRunnable { |
1363 |
< |
final static int NEW = 0; |
1364 |
< |
final static int RUNNING = 1; |
1365 |
< |
final static int DONE = 2; |
1363 |
> |
static final int NEW = 0; |
1364 |
> |
static final int RUNNING = 1; |
1365 |
> |
static final int DONE = 2; |
1366 |
|
final CountDownLatch latch; |
1367 |
|
int state = NEW; |
1368 |
|
LatchAwaiter(CountDownLatch latch) { this.latch = latch; } |
1372 |
|
state = 2; |
1373 |
|
} |
1374 |
|
} |
1375 |
< |
|
1375 |
> |
|
1376 |
|
public LatchAwaiter awaiter(CountDownLatch latch) { |
1377 |
|
return new LatchAwaiter(latch); |
1378 |
|
} |