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; |
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 |
2466 |
|
* java.lang.RuntimePermission}{@code ("modifyThread")} |
2467 |
|
*/ |
2468 |
|
public ForkJoinPool() { |
2469 |
< |
this(Runtime.getRuntime().availableProcessors(), |
2469 |
> |
this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()), |
2470 |
|
defaultForkJoinWorkerThreadFactory, null, false); |
2471 |
|
} |
2472 |
|
|
2685 |
|
// In previous versions of this class, this method constructed |
2686 |
|
// a task to run ForkJoinTask.invokeAll, but now external |
2687 |
|
// invocation of multiple tasks is at least as efficient. |
2688 |
< |
List<ForkJoinTask<T>> fs = new ArrayList<ForkJoinTask<T>>(tasks.size()); |
2689 |
< |
// Workaround needed because method wasn't declared with |
2690 |
< |
// wildcards in return type but should have been. |
2691 |
< |
@SuppressWarnings({"unchecked", "rawtypes"}) |
2692 |
< |
List<Future<T>> futures = (List<Future<T>>) (List) fs; |
2688 |
> |
ArrayList<Future<T>> futures = new ArrayList<Future<T>>(tasks.size()); |
2689 |
|
|
2690 |
|
boolean done = false; |
2691 |
|
try { |
2692 |
|
for (Callable<T> t : tasks) { |
2693 |
|
ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t); |
2694 |
+ |
futures.add(f); |
2695 |
|
externalPush(f); |
2699 |
– |
fs.add(f); |
2696 |
|
} |
2697 |
< |
for (ForkJoinTask<T> f : fs) |
2698 |
< |
f.quietlyJoin(); |
2697 |
> |
for (int i = 0, size = futures.size(); i < size; i++) |
2698 |
> |
((ForkJoinTask<?>)futures.get(i)).quietlyJoin(); |
2699 |
|
done = true; |
2700 |
|
return futures; |
2701 |
|
} finally { |
2702 |
|
if (!done) |
2703 |
< |
for (ForkJoinTask<T> f : fs) |
2704 |
< |
f.cancel(false); |
2703 |
> |
for (int i = 0, size = futures.size(); i < size; i++) |
2704 |
> |
futures.get(i).cancel(false); |
2705 |
|
} |
2706 |
|
} |
2707 |
|
|