ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/ForkJoinPool.java
(Generate patch)

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.63 by jsr166, Sun Jul 21 06:27:42 2013 UTC vs.
Revision 1.65 by jsr166, Sat Sep 12 19:16:45 2015 UTC

# Line 1533 | Line 1533 | public class ForkJoinPool extends Abstra
1533                       (m = ws.length - 1) < 0) { // initialize workQueues
1534                  int p = parallelism;            // find power of two table size
1535                  int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
1536 <                n |= n >>> 1; n |= n >>> 2;  n |= n >>> 4;
1537 <                n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
1536 >                n |= n >>> 1;
1537 >                n |= n >>> 2;
1538 >                n |= n >>> 4;
1539 >                n |= n >>> 8;
1540 >                n |= n >>> 16;
1541 >                n = (n + 1) << 1;
1542                  WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
1543                                     new WorkQueue[n] : null);
1544                  if (((ps = plock) & PL_LOCK) != 0 ||
# Line 2096 | Line 2100 | public class ForkJoinPool extends Abstra
2100                      w.currentSteal = ps;
2101                  }
2102              }
2103 <            else if (active) {       // decrement active count without queuing
2103 >            else if (active) {      // decrement active count without queuing
2104                  long nc = ((c = ctl) & ~AC_MASK) | ((c & AC_MASK) - AC_UNIT);
2105                  if ((int)(nc >> AC_SHIFT) + parallelism == 0)
2106                      break;          // bypass decrement-then-increment

Diff Legend

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