590 |
|
} |
591 |
|
|
592 |
|
/** |
593 |
< |
* Finds missing try { ... } finally { joinPool(e); } |
593 |
> |
* Finds missing PoolCleaners |
594 |
|
*/ |
595 |
|
void checkForkJoinPoolThreadLeaks() throws InterruptedException { |
596 |
|
Thread[] survivors = new Thread[7]; |
749 |
|
/** |
750 |
|
* Delays, via Thread.sleep, for the given millisecond delay, but |
751 |
|
* if the sleep is shorter than specified, may re-sleep or yield |
752 |
< |
* until time elapses. |
752 |
> |
* until time elapses. Ensures that the given time, as measured |
753 |
> |
* by System.nanoTime(), has elapsed. |
754 |
|
*/ |
755 |
|
static void delay(long millis) throws InterruptedException { |
756 |
< |
long startTime = System.nanoTime(); |
757 |
< |
long ns = millis * 1000 * 1000; |
758 |
< |
for (;;) { |
756 |
> |
long nanos = millis * (1000 * 1000); |
757 |
> |
final long wakeupTime = System.nanoTime() + nanos; |
758 |
> |
do { |
759 |
|
if (millis > 0L) |
760 |
|
Thread.sleep(millis); |
761 |
|
else // too short to sleep |
762 |
|
Thread.yield(); |
763 |
< |
long d = ns - (System.nanoTime() - startTime); |
764 |
< |
if (d > 0L) |
765 |
< |
millis = d / (1000 * 1000); |
765 |
< |
else |
766 |
< |
break; |
767 |
< |
} |
763 |
> |
nanos = wakeupTime - System.nanoTime(); |
764 |
> |
millis = nanos / (1000 * 1000); |
765 |
> |
} while (nanos >= 0L); |
766 |
|
} |
767 |
|
|
768 |
|
/** |
1317 |
|
} |
1318 |
|
|
1319 |
|
class LatchAwaiter extends CheckedRunnable { |
1320 |
< |
final static int NEW = 0; |
1321 |
< |
final static int RUNNING = 1; |
1322 |
< |
final static int DONE = 2; |
1320 |
> |
static final int NEW = 0; |
1321 |
> |
static final int RUNNING = 1; |
1322 |
> |
static final int DONE = 2; |
1323 |
|
final CountDownLatch latch; |
1324 |
|
int state = NEW; |
1325 |
|
LatchAwaiter(CountDownLatch latch) { this.latch = latch; } |
1329 |
|
state = 2; |
1330 |
|
} |
1331 |
|
} |
1332 |
< |
|
1332 |
> |
|
1333 |
|
public LatchAwaiter awaiter(CountDownLatch latch) { |
1334 |
|
return new LatchAwaiter(latch); |
1335 |
|
} |