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.149 by dl, Wed Nov 21 19:54:39 2012 UTC vs.
Revision 1.153 by jsr166, Mon Nov 26 14:11:54 2012 UTC

# Line 51 | Line 51 | import java.util.concurrent.TimeUnit;
51   * dynamically adding, suspending, or resuming internal worker
52   * threads, even if some tasks are stalled waiting to join
53   * others. However, no such adjustments are guaranteed in the face of
54 < * blocked IO or other unmanaged synchronization. The nested {@link
54 > * blocked I/O or other unmanaged synchronization. The nested {@link
55   * ManagedBlocker} interface enables extension of the kinds of
56   * synchronization accommodated.
57   *
# Line 99 | Line 99 | import java.util.concurrent.TimeUnit;
99   *
100   * <p>The common pool is by default constructed with default
101   * parameters, but these may be controlled by setting three {@link
102 < * System#getProperty properties} with prefix {@code
102 > * System#getProperty system properties} with prefix {@code
103   * java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
104   * an integer greater than zero, {@code threadFactory} -- the class
105   * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
# Line 1326 | Line 1326 | public class ForkJoinPool extends Abstra
1326       * wrap around zero, this method harmlessly fails to reinitialize
1327       * if workQueues exists, while still advancing plock.
1328       *
1329 <     * Additonally tries to create the first worker.
1329 >     * Additionally tries to create the first worker.
1330       */
1331      private void initWorkers() {
1332          WorkQueue[] ws, nws; int ps;
# Line 1788 | Line 1788 | public class ForkJoinPool extends Abstra
1788          WorkQueue[] ws; WorkQueue w; Thread p; long c; int m, u, e, i, s;
1789          if ((u = (int)(ctl >>> 32)) < 0 && (u >> UAC_SHIFT) < 0 &&
1790              (ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1791 <            outer: for (int k = origin, j = once? 0 : m; j >= 0; --j) {
1791 >            outer: for (int k = origin, j = once ? 0 : m; j >= 0; --j) {
1792                  WorkQueue q = ws[k++ & m];
1793                  for (int n = m;;) { // limit to at most m signals
1794                      if (task != null && task.status < 0)
# Line 3036 | Line 3036 | public class ForkJoinPool extends Abstra
3036       * commenced but not yet completed.  This method may be useful for
3037       * debugging. A return of {@code true} reported a sufficient
3038       * period after shutdown may indicate that submitted tasks have
3039 <     * ignored or suppressed interruption, or are waiting for IO,
3039 >     * ignored or suppressed interruption, or are waiting for I/O,
3040       * causing this executor not to properly terminate. (See the
3041       * advisory notes for class {@link ForkJoinTask} stating that
3042       * tasks should not normally entail blocking operations.  But if

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines