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.11 by jsr166, Tue Jul 21 00:15:14 2009 UTC vs.
Revision 1.13 by jsr166, Wed Jul 22 01:36:51 2009 UTC

# Line 21 | Line 21 | import java.lang.reflect.*;
21   * create such a subclass, you will also need to supply a custom
22   * ForkJoinWorkerThreadFactory to use it in a ForkJoinPool.
23   *
24 + * @since 1.7
25 + * @author Doug Lea
26   */
27   public class ForkJoinWorkerThread extends Thread {
28      /*
# Line 273 | Line 275 | public class ForkJoinWorkerThread extend
275              int s = runState;
276              if (s >= state)
277                  return false;
278 <            if (_unsafe.compareAndSwapInt(this, runStateOffset, s, state))
278 >            if (UNSAFE.compareAndSwapInt(this, runStateOffset, s, state))
279                  return true;
280          }
281      }
# Line 409 | Line 411 | public class ForkJoinWorkerThread extend
411       */
412      private static void setSlot(ForkJoinTask<?>[] q, int i,
413                                  ForkJoinTask<?> t){
414 <        _unsafe.putOrderedObject(q, (i << qShift) + qBase, t);
414 >        UNSAFE.putOrderedObject(q, (i << qShift) + qBase, t);
415      }
416  
417      /**
# Line 418 | Line 420 | public class ForkJoinWorkerThread extend
420       */
421      private static boolean casSlotNull(ForkJoinTask<?>[] q, int i,
422                                         ForkJoinTask<?> t) {
423 <        return _unsafe.compareAndSwapObject(q, (i << qShift) + qBase, t, null);
423 >        return UNSAFE.compareAndSwapObject(q, (i << qShift) + qBase, t, null);
424      }
425  
426      /**
427       * Sets sp in store-order.
428       */
429      private void storeSp(int s) {
430 <        _unsafe.putOrderedInt(this, spOffset, s);
430 >        UNSAFE.putOrderedInt(this, spOffset, s);
431      }
432  
433      // Main queue methods
# Line 756 | Line 758 | public class ForkJoinWorkerThread extend
758  
759      private static long fieldOffset(String fieldName)
760              throws NoSuchFieldException {
761 <        return _unsafe.objectFieldOffset
761 >        return UNSAFE.objectFieldOffset
762              (ForkJoinWorkerThread.class.getDeclaredField(fieldName));
763      }
764  
765 <    static final Unsafe _unsafe;
765 >    static final Unsafe UNSAFE;
766      static final long baseOffset;
767      static final long spOffset;
768      static final long runStateOffset;
# Line 768 | Line 770 | public class ForkJoinWorkerThread extend
770      static final int qShift;
771      static {
772          try {
773 <            _unsafe = getUnsafe();
773 >            UNSAFE = getUnsafe();
774              baseOffset = fieldOffset("base");
775              spOffset = fieldOffset("sp");
776              runStateOffset = fieldOffset("runState");
777 <            qBase = _unsafe.arrayBaseOffset(ForkJoinTask[].class);
778 <            int s = _unsafe.arrayIndexScale(ForkJoinTask[].class);
777 >            qBase = UNSAFE.arrayBaseOffset(ForkJoinTask[].class);
778 >            int s = UNSAFE.arrayIndexScale(ForkJoinTask[].class);
779              if ((s & (s-1)) != 0)
780                  throw new Error("data type scale not a power of two");
781              qShift = 31 - Integer.numberOfLeadingZeros(s);

Diff Legend

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