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.119 by dl, Tue Jan 31 00:44:13 2012 UTC vs.
Revision 1.122 by jsr166, Tue Jan 31 01:51:13 2012 UTC

# Line 458 | Line 458 | public class ForkJoinPool extends Abstra
458          h ^= h >>> 16; h *= 0x85ebca6b;
459          h ^= h >>> 13; h *= 0xc2b2ae35;
460          h ^= h >>> 16;
461 <        return (h == 0)? 1 : h; // ensure nonzero
461 >        return (h == 0) ? 1 : h; // ensure nonzero
462      }
463  
464      /**
# Line 1001 | Line 1001 | public class ForkJoinPool extends Abstra
1001  
1002      /**
1003       * Per-thread records for threads that submit to pools. Currently
1004 <     * holds only psuedo-random seed / index that is used to choose
1004 >     * holds only pseudo-random seed / index that is used to choose
1005       * submission queues in method doSubmit. In the future, this may
1006       * also incorporate a means to implement different task rejection
1007       * and resubmission policies.
# Line 1553 | Line 1553 | public class ForkJoinPool extends Abstra
1553                      w.totalSteals += ns;
1554                  }
1555              }
1556 <            else{                            // already queued
1556 >            else {                           // already queued
1557                  if (parallelism == -a)
1558                      idleAwaitWork(w);        // quiescent
1559                  if (w.eventCount == ec) {
# Line 1818 | Line 1818 | public class ForkJoinPool extends Abstra
1818       *
1819       * @param now if true, unconditionally terminate, else only
1820       * if no work and no active workers
1821 <     * @paran enable if true, enable shutdown when next possible
1821 >     * @param enable if true, enable shutdown when next possible
1822       * @return true if now terminating or terminated
1823       */
1824      private boolean tryTerminate(boolean now, boolean enable) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines