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.176 by jsr166, Tue Jan 22 23:00:06 2013 UTC vs.
Revision 1.179 by jsr166, Mon Jan 28 19:01:38 2013 UTC

# Line 708 | Line 708 | public class ForkJoinPool extends Abstra
708           * shared-queue version is embedded in method externalPush.)
709           *
710           * @param task the task. Caller must ensure non-null.
711 <         * @throw RejectedExecutionException if array cannot be resized
711 >         * @throws RejectedExecutionException if array cannot be resized
712           */
713          final void push(ForkJoinTask<?> task) {
714              ForkJoinTask<?>[] a; ForkJoinPool p;
# Line 1244 | Line 1244 | public class ForkJoinPool extends Abstra
1244      volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
1245      volatile Object pad18, pad19, pad1a, pad1b;
1246  
1247 <    /*
1247 >    /**
1248       * Acquires the plock lock to protect worker array and related
1249       * updates. This method is called only if an initial CAS on plock
1250       * fails. This acts as a spinlock for normal cases, but falls back
# Line 2691 | Line 2691 | public class ForkJoinPool extends Abstra
2691          try {
2692              for (Callable<T> t : tasks) {
2693                  ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
2694 –                externalPush(f);
2694                  futures.add(f);
2695 +                externalPush(f);
2696              }
2697              for (int i = 0, size = futures.size(); i < size; i++)
2698                  ((ForkJoinTask<?>)futures.get(i)).quietlyJoin();

Diff Legend

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