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.12 by dl, Wed Nov 14 17:20:29 2012 UTC vs.
Revision 1.15 by jsr166, Sun Nov 18 06:31:13 2012 UTC

# Line 105 | Line 105 | import java.util.concurrent.TimeUnit;
105   * an integer greater than zero, {@code threadFactory} -- the class
106   * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
107   * exceptionHandler} -- the class name of a {@link
108 + * java.lang.Thread.UncaughtExceptionHandler
109   * Thread.UncaughtExceptionHandler}. Upon any error in establishing
110   * these settings, default parameters are used.
111   *
# Line 449 | Line 450 | public class ForkJoinPool extends Abstra
450       * perform some subtask processing (see externalHelpJoin and
451       * related methods).  We do not need to record whether these
452       * submissions are to the common pool -- if not, externalHelpJoin
453 <     * returns quicky (at the most helping to signal some common pool
453 >     * returns quickly (at the most helping to signal some common pool
454       * workers). These submitters would otherwise be blocked waiting
455       * for completion, so the extra effort (with liberally sprinkled
456       * task status checks) in inapplicable cases amounts to an odd
# Line 654 | Line 655 | public class ForkJoinPool extends Abstra
655  
656          /**
657           * Pushes a task. Call only by owner in unshared queues.
658 <         * Cases needing resizing or rejection are relyaed to fullPush
658 >         * Cases needing resizing or rejection are relayed to fullPush
659           * (that also handles shared queues).
660           *
661           * @param task the task. Caller must ensure non-null.
# Line 1291 | Line 1292 | public class ForkJoinPool extends Abstra
1292                      --spins;
1293              }
1294              else if (U.compareAndSwapInt(this, PLOCK, ps, ps | PL_SIGNAL)) {
1295 <                synchronized(this) {
1295 >                synchronized (this) {
1296                      if ((plock & PL_SIGNAL) != 0) {
1297                          try {
1298                              wait();
# Line 1315 | Line 1316 | public class ForkJoinPool extends Abstra
1316       */
1317      private void releasePlock(int ps) {
1318          plock = ps;
1319 <        synchronized(this) { notifyAll(); }
1319 >        synchronized (this) { notifyAll(); }
1320      }
1321  
1322      //  Registering and deregistering workers
# Line 1632 | Line 1633 | public class ForkJoinPool extends Abstra
1633       * termination and possibly shrink pool.
1634       *
1635       * * If already enqueued and none of the above apply, possibly
1636 <     * (with 1/2 probablility) park awaiting signal, else lingering to
1636 >     * (with 1/2 probability) park awaiting signal, else lingering to
1637       * help scan and signal.
1638       *
1639       * @param w the worker (via its WorkQueue)
# Line 2305 | Line 2306 | public class ForkJoinPool extends Abstra
2306                                  }
2307                                  break;
2308                              }
2309 <                        } while((r = r.completer) != null);
2309 >                        } while ((r = r.completer) != null);
2310                      }
2311                  }
2312                  if (task != null)
# Line 3196 | Line 3197 | public class ForkJoinPool extends Abstra
3197                             getSystemClassLoader().loadClass(hp).newInstance());
3198              if (pp != null)
3199                  par = Integer.parseInt(pp);
3200 <        } catch(Exception ignore) {
3200 >        } catch (Exception ignore) {
3201          }
3202  
3203          int s; // initialize field offsets for CAS etc

Diff Legend

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