ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinPool.java

Comparing jsr166/src/main/java/util/concurrent/ForkJoinPool.java (file contents):
Revision 1.41 by dl, Sun Oct 10 11:55:39 2010 UTC vs.
Revision 1.42 by jsr166, Fri Oct 22 05:18:30 2010 UTC

#	Line 705 | Line 705 | public class ForkJoinPool extends Abstra
705		*/
706		final void workerTerminated(ForkJoinWorkerThread w) {
707		forgetWorker(w);
708	<	decrementWorkerCounts(w.isTrimmed()? 0 : ONE_RUNNING, ONE_TOTAL);
708	>	decrementWorkerCounts(w.isTrimmed() ? 0 : ONE_RUNNING, ONE_TOTAL);
709		while (w.stealCount != 0) // collect final count
710		tryAccumulateStealCount(w);
711		tryTerminate(false);
#	Line 791 | Line 791 | public class ForkJoinPool extends Abstra
791		if (tryAccumulateStealCount(w)) { // transfer while idle
792		boolean untimed = (w.nextWaiter != 0L ||
793		(workerCounts & RUNNING_COUNT_MASK) <= 1);
794	<	long startTime = untimed? 0 : System.nanoTime();
794	>	long startTime = untimed ? 0 : System.nanoTime();
795		Thread.interrupted();         // clear/ignore interrupt
796		if (eventCount != ec || w.isTerminating())
797		break;                    // recheck after clear

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines