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

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.185 by jsr166, Sat Feb 16 20:50:29 2013 UTC vs.
Revision 1.189 by jsr166, Sat Sep 12 19:16:45 2015 UTC

# Line 687 | Line 687 | public class ForkJoinPool extends Abstra
687              return (n >= 0) ? 0 : -n; // ignore transient negative
688          }
689  
690 <       /**
690 >        /**
691           * Provides a more accurate estimate of whether this queue has
692           * any tasks than does queueSize, by checking whether a
693           * near-empty queue has at least one unclaimed task.
# Line 725 | Line 725 | public class ForkJoinPool extends Abstra
725              }
726          }
727  
728 <       /**
728 >        /**
729           * Initializes or doubles the capacity of array. Call either
730           * by owner or with lock held -- it is OK for base, but not
731           * top, to move while resizings are in progress.
# Line 1521 | Line 1521 | public class ForkJoinPool extends Abstra
1521                       (m = ws.length - 1) < 0) { // initialize workQueues
1522                  int p = config & SMASK;         // find power of two table size
1523                  int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
1524 <                n |= n >>> 1; n |= n >>> 2;  n |= n >>> 4;
1525 <                n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
1524 >                n |= n >>> 1;
1525 >                n |= n >>> 2;
1526 >                n |= n >>> 4;
1527 >                n |= n >>> 8;
1528 >                n |= n >>> 16;
1529 >                n = (n + 1) << 1;
1530                  WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
1531                                     new WorkQueue[n] : null);
1532                  if (((ps = plock) & PL_LOCK) != 0 ||
# Line 2127 | Line 2131 | public class ForkJoinPool extends Abstra
2131                      w.runSubtask(t);
2132                  }
2133              }
2134 <            else if (active) {       // decrement active count without queuing
2134 >            else if (active) {      // decrement active count without queuing
2135                  long nc = (c = ctl) - AC_UNIT;
2136                  if ((int)(nc >> AC_SHIFT) + (config & SMASK) == 0)
2137 <                    return;          // bypass decrement-then-increment
2137 >                    return;         // bypass decrement-then-increment
2138                  if (U.compareAndSwapLong(this, CTL, c, nc))
2139                      active = false;
2140              }

Diff Legend

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