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.32 by jsr166, Thu Jul 30 22:05:19 2009 UTC vs.
Revision 1.33 by dl, Fri Jul 31 16:27:08 2009 UTC

# Line 589 | Line 589 | public class ForkJoinPool extends Abstra
589          if (task instanceof ForkJoinTask<?>) // avoid re-wrap
590              job = (ForkJoinTask<?>) task;
591          else
592 <            job = new AdaptedRunnable<Void>(task, null);
592 >            job = ForkJoinTask.adapt(task, null);
593          doSubmit(job);
594      }
595  
596      public <T> ForkJoinTask<T> submit(Callable<T> task) {
597 <        ForkJoinTask<T> job = new AdaptedCallable<T>(task);
597 >        ForkJoinTask<T> job = ForkJoinTask.adapt(task);
598          doSubmit(job);
599          return job;
600      }
601  
602      public <T> ForkJoinTask<T> submit(Runnable task, T result) {
603 <        ForkJoinTask<T> job = new AdaptedRunnable<T>(task, result);
603 >        ForkJoinTask<T> job = ForkJoinTask.adapt(task, result);
604          doSubmit(job);
605          return job;
606      }
# Line 610 | Line 610 | public class ForkJoinPool extends Abstra
610          if (task instanceof ForkJoinTask<?>) // avoid re-wrap
611              job = (ForkJoinTask<?>) task;
612          else
613 <            job = new AdaptedRunnable<Void>(task, null);
613 >            job = ForkJoinTask.adapt(task, null);
614          doSubmit(job);
615          return job;
616      }
# Line 629 | Line 629 | public class ForkJoinPool extends Abstra
629          return task;
630      }
631  
632 –    /**
633 –     * Adaptor for Runnables. This implements RunnableFuture
634 –     * to be compliant with AbstractExecutorService constraints.
635 –     */
636 –    static final class AdaptedRunnable<T> extends ForkJoinTask<T>
637 –        implements RunnableFuture<T> {
638 –        final Runnable runnable;
639 –        final T resultOnCompletion;
640 –        T result;
641 –        AdaptedRunnable(Runnable runnable, T result) {
642 –            if (runnable == null) throw new NullPointerException();
643 –            this.runnable = runnable;
644 –            this.resultOnCompletion = result;
645 –        }
646 –        public T getRawResult() { return result; }
647 –        public void setRawResult(T v) { result = v; }
648 –        public boolean exec() {
649 –            runnable.run();
650 –            result = resultOnCompletion;
651 –            return true;
652 –        }
653 –        public void run() { invoke(); }
654 –        private static final long serialVersionUID = 5232453952276885070L;
655 –    }
656 –
657 –    /**
658 –     * Adaptor for Callables
659 –     */
660 –    static final class AdaptedCallable<T> extends ForkJoinTask<T>
661 –        implements RunnableFuture<T> {
662 –        final Callable<T> callable;
663 –        T result;
664 –        AdaptedCallable(Callable<T> callable) {
665 –            if (callable == null) throw new NullPointerException();
666 –            this.callable = callable;
667 –        }
668 –        public T getRawResult() { return result; }
669 –        public void setRawResult(T v) { result = v; }
670 –        public boolean exec() {
671 –            try {
672 –                result = callable.call();
673 –                return true;
674 –            } catch (Error err) {
675 –                throw err;
676 –            } catch (RuntimeException rex) {
677 –                throw rex;
678 –            } catch (Exception ex) {
679 –                throw new RuntimeException(ex);
680 –            }
681 –        }
682 –        public void run() { invoke(); }
683 –        private static final long serialVersionUID = 2838392045355241008L;
684 –    }
632  
633      public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) {
634          ArrayList<ForkJoinTask<T>> forkJoinTasks =
635              new ArrayList<ForkJoinTask<T>>(tasks.size());
636          for (Callable<T> task : tasks)
637 <            forkJoinTasks.add(new AdaptedCallable<T>(task));
637 >            forkJoinTasks.add(ForkJoinTask.adapt(task));
638          invoke(new InvokeAll<T>(forkJoinTasks));
639  
640          @SuppressWarnings({"unchecked", "rawtypes"})
# Line 1881 | Line 1828 | public class ForkJoinPool extends Abstra
1828          do {} while (!blocker.isReleasable() && !blocker.block());
1829      }
1830  
1831 <    // AbstractExecutorService overrides
1831 >    // AbstractExecutorService overrides.  These rely on undocumented
1832 >    // fact that ForkJoinTask.adapt returns ForkJoinTasks that also
1833 >    // implement RunnableFuture.
1834  
1835      protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
1836 <        return new AdaptedRunnable<T>(runnable, value);
1836 >        return (RunnableFuture<T>)ForkJoinTask.adapt(runnable, value);
1837      }
1838  
1839      protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
1840 <        return new AdaptedCallable<T>(callable);
1840 >        return (RunnableFuture<T>)ForkJoinTask.adapt(callable);
1841      }
1842  
1843      // Unsafe mechanics

Diff Legend

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