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.185 by dl, Wed May 22 13:39:40 2013 UTC vs.
Revision 1.186 by jsr166, Wed May 22 16:08:05 2013 UTC

#	Line 1546 | Line 1546 | public class ForkJoinPool extends Abstra
1546		*/
1547		final void incrementActiveCount() {
1548		long c;
1549	<	do {} while(!U.compareAndSwapLong
1550	<	(this, CTL, c = ctl, ((c & ~AC_MASK) |
1551	<	((c & AC_MASK) + AC_UNIT))));
1549	>	do {} while (!U.compareAndSwapLong
1550	>	(this, CTL, c = ctl, ((c & ~AC_MASK) |
1551	>	((c & AC_MASK) + AC_UNIT))));
1552		}
1553
1554		/**
#	Line 1959 | Line 1959 | public class ForkJoinPool extends Abstra
1959		}
1960		}
1961		long c; // reactivate
1962	<	do {} while(!U.compareAndSwapLong
1963	<	(this, CTL, c = ctl,
1964	<	((c & ~AC_MASK) |
1965	<	((c & AC_MASK) + AC_UNIT))));
1962	>	do {} while (!U.compareAndSwapLong
1963	>	(this, CTL, c = ctl,
1964	>	((c & ~AC_MASK) |
1965	>	((c & AC_MASK) + AC_UNIT))));
1966		}
1967		}
1968		}
#	Line 2032 | Line 2032 | public class ForkJoinPool extends Abstra
2032		if ((q = findNonEmptyStealQueue()) != null) {
2033		if (!active) {      // re-establish active count
2034		active = true;
2035	<	do {} while(!U.compareAndSwapLong
2036	<	(this, CTL, c = ctl,
2037	<	((c & ~AC_MASK) |
2038	<	((c & AC_MASK) + AC_UNIT))));
2035	>	do {} while (!U.compareAndSwapLong
2036	>	(this, CTL, c = ctl,
2037	>	((c & ~AC_MASK) |
2038	>	((c & AC_MASK) + AC_UNIT))));
2039		}
2040		if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2041		(w.currentSteal = t).doExec();

Diff Legend

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