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.14 by jsr166, Wed Nov 14 19:05:03 2012 UTC

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

Diff Legend

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