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.258 by dl, Fri Aug 7 17:20:22 2015 UTC vs.
Revision 1.259 by jsr166, Sat Aug 8 17:47:32 2015 UTC

#	Line 1462 | Line 1462 | public class ForkJoinPool extends Abstra
1462		n |= n >>> 8; n |= n >>> 16; n = ((n + 1) << 1) & SMASK;
1463		AtomicLong sc = new AtomicLong();
1464		WorkQueue[] ws = new WorkQueue[n];
1465	<	synchronized(modifyThreadPermission) { // double-check
1465	>	synchronized (modifyThreadPermission) { // double-check
1466		if (((rs = runState) & STARTED) == 0) {
1467		workQueues = ws;
1468		runState = rs | STARTED;
#	Line 2348 | Line 2348 | public class ForkJoinPool extends Abstra
2348		return false;
2349		while ((lock = stealCounter) == null)
2350		tryInitialize(false);
2351	<	synchronized(lock) {
2351	>	synchronized (lock) {
2352		rs = runState = runState | SHUTDOWN;
2353		}
2354
#	Line 2379 | Line 2379 | public class ForkJoinPool extends Abstra
2379		break;
2380		}
2381		}
2382	<	synchronized(lock) {
2382	>	synchronized (lock) {
2383		rs = runState = runState | STOP;
2384		}
2385		}
#	Line 2390 | Line 2390 | public class ForkJoinPool extends Abstra
2390		long checkSum = ctl;
2391		if ((short)(checkSum >>> TC_SHIFT) + (config & SMASK) <= 0 ||
2392		(ws = workQueues) == null || (m = ws.length - 1) < 0) {
2393	<	synchronized(lock) {
2393	>	synchronized (lock) {
2394		rs = runState = runState | TERMINATED;
2395		}
2396		synchronized (this) {

Diff Legend

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