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

Comparing jsr166/src/jsr166y/ForkJoinWorkerThread.java (file contents):
Revision 1.63 by dl, Tue Feb 22 00:39:31 2011 UTC vs.
Revision 1.66 by jsr166, Wed Jun 1 21:04:30 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   package jsr166y;
# Line 331 | Line 331 | public class ForkJoinWorkerThread extend
331       */
332      protected void onStart() {
333          queue = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
334 <        int r = pool.workerSeedGenerator.nextInt();
335 <        seed = (r == 0)? 1 : r; //  must be nonzero
334 >        int r = ForkJoinPool.workerSeedGenerator.nextInt();
335 >        seed = (r == 0) ? 1 : r; //  must be nonzero
336      }
337  
338      /**
# Line 695 | Line 695 | public class ForkJoinWorkerThread extend
695                          Thread.yield();        // for politeness
696                  }
697                  else
698 <                    retries = helpJoinTask(joinMe)? MAX_HELP : retries - 1;
698 >                    retries = helpJoinTask(joinMe) ? MAX_HELP : retries - 1;
699              }
700              else {
701                  retries = MAX_HELP;           // restart if not done
# Line 926 | Line 926 | public class ForkJoinWorkerThread extend
926                      p.addActiveCount(1);
927                  }
928                  if ((t = (v != this) ? v.deqTask() :
929 <                     locallyFifo? locallyDeqTask() : popTask()) != null) {
929 >                     locallyFifo ? locallyDeqTask() : popTask()) != null) {
930                      currentSteal = t;
931                      t.doExec();
932                      currentSteal = ps;
# Line 955 | Line 955 | public class ForkJoinWorkerThread extend
955          int s;
956          try {
957              UNSAFE = getUnsafe();
958 <            Class a = ForkJoinTask[].class;
958 >            Class<?> a = ForkJoinTask[].class;
959              ABASE = UNSAFE.arrayBaseOffset(a);
960              s = UNSAFE.arrayIndexScale(a);
961          } catch (Exception e) {

Diff Legend

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