ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.86 by dl, Sun Nov 21 20:42:18 2010 UTC vs.
Revision 1.87 by dl, Tue Nov 23 00:10:39 2010 UTC

#	Line 586 | Line 586 | public class ForkJoinPool extends Abstra
586		// are usually manually inlined by callers
587
588		/**
589	<	* Increments running count part of workerCounts
589	>	* Increments running count part of workerCounts.
590		*/
591		final void incrementRunningCount() {
592		int c;
#	Line 596 | Line 596 | public class ForkJoinPool extends Abstra
596		}
597
598		/**
599	<	* Tries to increment running count part of workerCounts
599	>	* Tries to increment running count part of workerCounts.
600		*/
601		final boolean tryIncrementRunningCount() {
602		int c;
#	Line 606 | Line 606 | public class ForkJoinPool extends Abstra
606		}
607
608		/**
609	<	* Tries to decrement running count unless already zero
609	>	* Tries to decrement running count unless already zero.
610		*/
611		final boolean tryDecrementRunningCount() {
612		int wc = workerCounts;
#	Line 1058 | Line 1058 | public class ForkJoinPool extends Abstra
1058		long h = eventWaiters;
1059		if (h != 0L && (int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
1060		releaseEventWaiters();
1061	–	if (joinMe.status < 0)
1062	–	break;
1061		if ((workerCounts & RUNNING_COUNT_MASK) != 0) {
1062		long ms; int ns;
1063		if (!timed) {
#	Line 1078 | Line 1076 | public class ForkJoinPool extends Abstra
1076		else
1077		ns = (int) (nt % 1000000);
1078		}
1079	<	if (joinMe.internalAwaitDone(ms, ns) < 0)
1082	<	break;
1079	>	joinMe.internalAwaitDone(ms, ns);
1080		}
1081	+	if (joinMe.status < 0)
1082	+	break;
1083		}
1084		helpMaintainParallelism();
1085		}

Diff Legend

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