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.102 by jsr166, Thu Apr 14 01:17:58 2011 UTC vs.
Revision 1.104 by jsr166, Wed Jun 8 05:12:25 2011 UTC

# Line 292 | Line 292 | public class ForkJoinPool extends Abstra
292       * "terminate" status, cancels all unprocessed tasks, and wakes up
293       * all waiting workers.  Detecting whether termination should
294       * commence after a non-abrupt shutdown() call requires more work
295 <     * and bookkeeping. We need consensus about quiesence (i.e., that
295 >     * and bookkeeping. We need consensus about quiescence (i.e., that
296       * there is no more work) which is reflected in active counts so
297       * long as there are no current blockers, as well as possible
298       * re-evaluations during independent changes in blocking or
# Line 2121 | Line 2121 | public class ForkJoinPool extends Abstra
2121          int s;
2122          try {
2123              UNSAFE = getUnsafe();
2124 <            Class k = ForkJoinPool.class;
2124 >            Class<?> k = ForkJoinPool.class;
2125              ctlOffset = UNSAFE.objectFieldOffset
2126                  (k.getDeclaredField("ctl"));
2127              stealCountOffset = UNSAFE.objectFieldOffset
# Line 2134 | Line 2134 | public class ForkJoinPool extends Abstra
2134                  (k.getDeclaredField("scanGuard"));
2135              nextWorkerNumberOffset = UNSAFE.objectFieldOffset
2136                  (k.getDeclaredField("nextWorkerNumber"));
2137 <            Class a = ForkJoinTask[].class;
2137 >            Class<?> a = ForkJoinTask[].class;
2138              ABASE = UNSAFE.arrayBaseOffset(a);
2139              s = UNSAFE.arrayIndexScale(a);
2140          } catch (Exception e) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines