ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.16 by jsr166, Thu Jul 23 19:44:46 2009 UTC vs.
Revision 1.17 by jsr166, Thu Jul 23 23:07:57 2009 UTC

#	Line 90 | Line 90 | public class ForkJoinPool extends Abstra
90		}
91
92		/**
93	<	* Default ForkJoinWorkerThreadFactory implementation, creates a
93	>	* Default ForkJoinWorkerThreadFactory implementation; creates a
94		* new ForkJoinWorkerThread.
95		*/
96		static class  DefaultForkJoinWorkerThreadFactory
#	Line 184 | Line 184 | public class ForkJoinPool extends Abstra
184		private final LinkedTransferQueue<ForkJoinTask<?>> submissionQueue;
185
186		/**
187	<	* Head of Treiber stack for barrier sync. See below for explanation
187	>	* Head of Treiber stack for barrier sync. See below for explanation.
188		*/
189		private volatile WaitQueueNode syncStack;
190
#	Line 232 | Line 232 | public class ForkJoinPool extends Abstra
232		* Adds delta (which may be negative) to running count.  This must
233		* be called before (with negative arg) and after (with positive)
234		* any managed synchronization (i.e., mainly, joins).
235	+	*
236		* @param delta the number to add
237		*/
238		final void updateRunningCount(int delta) {
239		int s;
240	<	do;while (!casWorkerCounts(s = workerCounts, s + delta));
240	>	do {} while (!casWorkerCounts(s = workerCounts, s + delta));
241		}
242
243		/**
244		* Adds delta (which may be negative) to both total and running
245		* count.  This must be called upon creation and termination of
246		* worker threads.
247	+	*
248		* @param delta the number to add
249		*/
250		private void updateWorkerCount(int delta) {
251		int d = delta + (delta << 16); // add to both lo and hi parts
252		int s;
253	<	do;while (!casWorkerCounts(s = workerCounts, s + d));
253	>	do {} while (!casWorkerCounts(s = workerCounts, s + d));
254		}
255
256		/**
#	Line 274 | Line 276 | public class ForkJoinPool extends Abstra
276		private static int runControlFor(int r, int a)   { return (r << 16) + a; }
277
278		/**
279	<	* Try incrementing active count; fail on contention. Called by
280	<	* workers before/during executing tasks.
279	>	* Tries incrementing active count; fails on contention.
280	>	* Called by workers before/during executing tasks.
281	>	*
282		* @return true on success
283		*/
284		final boolean tryIncrementActiveCount() {
#	Line 287 | Line 290 | public class ForkJoinPool extends Abstra
290		* Tries decrementing active count; fails on contention.
291		* Possibly triggers termination on success.
292		* Called by workers when they can't find tasks.
293	+	*
294		* @return true on success
295		*/
296		final boolean tryDecrementActiveCount() {
#	Line 305 | Line 309 | public class ForkJoinPool extends Abstra
309		* terminating on shutdown.
310		*/
311		private static boolean canTerminateOnShutdown(int c) {
312	<	return ((c & -c) >>> 16) != 0; // i.e. least bit is nonzero runState bit
312	>	// i.e. least bit is nonzero runState bit
313	>	return ((c & -c) >>> 16) != 0;
314		}
315
316		/**
#	Line 331 | Line 336 | public class ForkJoinPool extends Abstra
336
337		/**
338		* Creates a ForkJoinPool with a pool size equal to the number of
339	<	* processors available on the system and using the default
340	<	* ForkJoinWorkerThreadFactory,
339	>	* processors available on the system, using the default
340	>	* ForkJoinWorkerThreadFactory.
341	>	*
342		* @throws SecurityException if a security manager exists and
343		*         the caller is not permitted to modify threads
344		*         because it does not hold {@link
345	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
345	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
346		*/
347		public ForkJoinPool() {
348		this(Runtime.getRuntime().availableProcessors(),
#	Line 345 | Line 351 | public class ForkJoinPool extends Abstra
351
352		/**
353		* Creates a ForkJoinPool with the indicated parallelism level
354	<	* threads, and using the default ForkJoinWorkerThreadFactory,
354	>	* threads and using the default ForkJoinWorkerThreadFactory.
355	>	*
356		* @param parallelism the number of worker threads
357		* @throws IllegalArgumentException if parallelism less than or
358		* equal to zero
359		* @throws SecurityException if a security manager exists and
360		*         the caller is not permitted to modify threads
361		*         because it does not hold {@link
362	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
362	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
363		*/
364		public ForkJoinPool(int parallelism) {
365		this(parallelism, defaultForkJoinWorkerThreadFactory);
#	Line 361 | Line 368 | public class ForkJoinPool extends Abstra
368		/**
369		* Creates a ForkJoinPool with parallelism equal to the number of
370		* processors available on the system and using the given
371	<	* ForkJoinWorkerThreadFactory,
371	>	* ForkJoinWorkerThreadFactory.
372	>	*
373		* @param factory the factory for creating new threads
374		* @throws NullPointerException if factory is null
375		* @throws SecurityException if a security manager exists and
376		*         the caller is not permitted to modify threads
377		*         because it does not hold {@link
378	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
378	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
379		*/
380		public ForkJoinPool(ForkJoinWorkerThreadFactory factory) {
381		this(Runtime.getRuntime().availableProcessors(), factory);
#	Line 384 | Line 392 | public class ForkJoinPool extends Abstra
392		* @throws SecurityException if a security manager exists and
393		*         the caller is not permitted to modify threads
394		*         because it does not hold {@link
395	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
395	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
396		*/
397		public ForkJoinPool(int parallelism, ForkJoinWorkerThreadFactory factory) {
398		if (parallelism <= 0 || parallelism > MAX_THREADS)
#	Line 405 | Line 413 | public class ForkJoinPool extends Abstra
413		}
414
415		/**
416	<	* Create new worker using factory.
416	>	* Creates a new worker thread using factory.
417	>	*
418		* @param index the index to assign worker
419		* @return new worker, or null of factory failed
420		*/
#	Line 427 | Line 436 | public class ForkJoinPool extends Abstra
436		* Returns a good size for worker array given pool size.
437		* Currently requires size to be a power of two.
438		*/
439	<	private static int arraySizeFor(int ps) {
440	<	return ps <= 1? 1 : (1 << (32 - Integer.numberOfLeadingZeros(ps-1)));
439	>	private static int arraySizeFor(int poolSize) {
440	>	return (poolSize <= 1) ? 1 :
441	>	(1 << (32 - Integer.numberOfLeadingZeros(poolSize-1)));
442		}
443
444		/**
#	Line 448 | Line 458 | public class ForkJoinPool extends Abstra
458		}
459
460		/**
461	<	* Try to shrink workers into smaller array after one or more terminate
461	>	* Tries to shrink workers into smaller array after one or more terminate.
462		*/
463		private void tryShrinkWorkerArray() {
464		ForkJoinWorkerThread[] ws = workers;
#	Line 464 | Line 474 | public class ForkJoinPool extends Abstra
474		}
475
476		/**
477	<	* Initialize workers if necessary
477	>	* Initializes workers if necessary.
478		*/
479		final void ensureWorkerInitialization() {
480		ForkJoinWorkerThread[] ws = workers;
#	Line 540 | Line 550 | public class ForkJoinPool extends Abstra
550		}
551
552		/**
553	<	* Performs the given task; returning its result upon completion
553	>	* Performs the given task, returning its result upon completion.
554	>	*
555		* @param task the task
556		* @return the task's result
557		* @throws NullPointerException if task is null
#	Line 553 | Line 564 | public class ForkJoinPool extends Abstra
564
565		/**
566		* Arranges for (asynchronous) execution of the given task.
567	+	*
568		* @param task the task
569		* @throws NullPointerException if task is null
570		* @throws RejectedExecutionException if pool is shut down
#	Line 587 | Line 599 | public class ForkJoinPool extends Abstra
599
600		/**
601		* Adaptor for Runnables. This implements RunnableFuture
602	<	* to be compliant with AbstractExecutorService constraints
602	>	* to be compliant with AbstractExecutorService constraints.
603		*/
604		static final class AdaptedRunnable<T> extends ForkJoinTask<T>
605		implements RunnableFuture<T> {
#	Line 643 | Line 655 | public class ForkJoinPool extends Abstra
655		for (Callable<T> c : tasks)
656		ts.add(new AdaptedCallable<T>(c));
657		invoke(new InvokeAll<T>(ts));
658	<	return (List<Future<T>>)(List)ts;
658	>	return (List<Future<T>>) (List) ts;
659		}
660
661		static final class InvokeAll<T> extends RecursiveAction {
662		final ArrayList<ForkJoinTask<T>> tasks;
663		InvokeAll(ArrayList<ForkJoinTask<T>> tasks) { this.tasks = tasks; }
664		public void compute() {
665	<	try { invokeAll(tasks); } catch(Exception ignore) {}
665	>	try { invokeAll(tasks); }
666	>	catch (Exception ignore) {}
667		}
668		}
669
670		// Configuration and status settings and queries
671
672		/**
673	<	* Returns the factory used for constructing new workers
673	>	* Returns the factory used for constructing new workers.
674		*
675		* @return the factory used for constructing new workers
676		*/
#	Line 668 | Line 681 | public class ForkJoinPool extends Abstra
681		/**
682		* Returns the handler for internal worker threads that terminate
683		* due to unrecoverable errors encountered while executing tasks.
684	+	*
685		* @return the handler, or null if none
686		*/
687		public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
#	Line 693 | Line 707 | public class ForkJoinPool extends Abstra
707		* @throws SecurityException if a security manager exists and
708		*         the caller is not permitted to modify threads
709		*         because it does not hold {@link
710	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
710	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
711		*/
712		public Thread.UncaughtExceptionHandler
713		setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler h) {
#	Line 721 | Line 735 | public class ForkJoinPool extends Abstra
735
736		/**
737		* Sets the target parallelism level of this pool.
738	+	*
739		* @param parallelism the target parallelism
740		* @throws IllegalArgumentException if parallelism less than or
741		* equal to zero or greater than maximum size bounds
742		* @throws SecurityException if a security manager exists and
743		*         the caller is not permitted to modify threads
744		*         because it does not hold {@link
745	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
745	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
746		*/
747		public void setParallelism(int parallelism) {
748		checkPermission();
#	Line 774 | Line 789 | public class ForkJoinPool extends Abstra
789		/**
790		* Returns the maximum number of threads allowed to exist in the
791		* pool, even if there are insufficient unblocked running threads.
792	+	*
793		* @return the maximum
794		*/
795		public int getMaximumPoolSize() {
#	Line 785 | Line 801 | public class ForkJoinPool extends Abstra
801		* pool, even if there are insufficient unblocked running threads.
802		* Setting this value has no effect on current pool size. It
803		* controls construction of new threads.
804	+	*
805		* @throws IllegalArgumentException if negative or greater then
806		* internal implementation limit
807		*/
#	Line 799 | Line 816 | public class ForkJoinPool extends Abstra
816		* Returns true if this pool dynamically maintains its target
817		* parallelism level. If false, new threads are added only to
818		* avoid possible starvation.
819	<	* This setting is by default true;
819	>	* This setting is by default true.
820	>	*
821		* @return true if maintains parallelism
822		*/
823		public boolean getMaintainsParallelism() {
#	Line 810 | Line 828 | public class ForkJoinPool extends Abstra
828		* Sets whether this pool dynamically maintains its target
829		* parallelism level. If false, new threads are added only to
830		* avoid possible starvation.
831	+	*
832		* @param enable true to maintains parallelism
833		*/
834		public void setMaintainsParallelism(boolean enable) {
#	Line 867 | Line 886 | public class ForkJoinPool extends Abstra
886		* Returns an estimate of the number of threads that are currently
887		* stealing or executing tasks. This method may overestimate the
888		* number of active threads.
889	+	*
890		* @return the number of active threads
891		*/
892		public int getActiveThreadCount() {
#	Line 877 | Line 897 | public class ForkJoinPool extends Abstra
897		* Returns an estimate of the number of threads that are currently
898		* idle waiting for tasks. This method may underestimate the
899		* number of idle threads.
900	+	*
901		* @return the number of idle threads
902		*/
903		final int getIdleThreadCount() {
904		int c = runningCountOf(workerCounts) - activeCountOf(runControl);
905	<	return (c <= 0)? 0 : c;
905	>	return (c <= 0) ? 0 : c;
906		}
907
908		/**
909		* Returns true if all worker threads are currently idle. An idle
910		* worker is one that cannot obtain a task to execute because none
911		* are available to steal from other threads, and there are no
912	<	* pending submissions to the pool. This method is conservative:
913	<	* It might not return true immediately upon idleness of all
912	>	* pending submissions to the pool. This method is conservative;
913	>	* it might not return true immediately upon idleness of all
914		* threads, but will eventually become true if threads remain
915		* inactive.
916	+	*
917		* @return true if all threads are currently idle
918		*/
919		public boolean isQuiescent() {
#	Line 903 | Line 925 | public class ForkJoinPool extends Abstra
925		* one thread's work queue by another. The reported value
926		* underestimates the actual total number of steals when the pool
927		* is not quiescent. This value may be useful for monitoring and
928	<	* tuning fork/join programs: In general, steal counts should be
928	>	* tuning fork/join programs: in general, steal counts should be
929		* high enough to keep threads busy, but low enough to avoid
930		* overhead and contention across threads.
931	+	*
932		* @return the number of steals
933		*/
934		public long getStealCount() {
#	Line 913 | Line 936 | public class ForkJoinPool extends Abstra
936		}
937
938		/**
939	<	* Accumulate steal count from a worker. Call only
940	<	* when worker known to be idle.
939	>	* Accumulates steal count from a worker.
940	>	* Call only when worker known to be idle.
941		*/
942		private void updateStealCount(ForkJoinWorkerThread w) {
943		int sc = w.getAndClearStealCount();
#	Line 929 | Line 952 | public class ForkJoinPool extends Abstra
952		* an approximation, obtained by iterating across all threads in
953		* the pool. This method may be useful for tuning task
954		* granularities.
955	+	*
956		* @return the number of queued tasks
957		*/
958		public long getQueuedTaskCount() {
#	Line 948 | Line 972 | public class ForkJoinPool extends Abstra
972		* Returns an estimate of the number tasks submitted to this pool
973		* that have not yet begun executing. This method takes time
974		* proportional to the number of submissions.
975	+	*
976		* @return the number of queued submissions
977		*/
978		public int getQueuedSubmissionCount() {
#	Line 957 | Line 982 | public class ForkJoinPool extends Abstra
982		/**
983		* Returns true if there are any tasks submitted to this pool
984		* that have not yet begun executing.
985	+	*
986		* @return {@code true} if there are any queued submissions
987		*/
988		public boolean hasQueuedSubmissions() {
#	Line 967 | Line 993 | public class ForkJoinPool extends Abstra
993		* Removes and returns the next unexecuted submission if one is
994		* available.  This method may be useful in extensions to this
995		* class that re-assign work in systems with multiple pools.
996	+	*
997		* @return the next submission, or null if none
998		*/
999		protected ForkJoinTask<?> pollSubmission() {
#	Line 986 | Line 1013 | public class ForkJoinPool extends Abstra
1013		* exception is thrown.  The behavior of this operation is
1014		* undefined if the specified collection is modified while the
1015		* operation is in progress.
1016	+	*
1017		* @param c the collection to transfer elements into
1018		* @return the number of elements transferred
1019		*/
#	Line 1046 | Line 1074 | public class ForkJoinPool extends Abstra
1074		* Invocation has no additional effect if already shut down.
1075		* Tasks that are in the process of being submitted concurrently
1076		* during the course of this method may or may not be rejected.
1077	+	*
1078		* @throws SecurityException if a security manager exists and
1079		*         the caller is not permitted to modify threads
1080		*         because it does not hold {@link
1081	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
1081	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
1082		*/
1083		public void shutdown() {
1084		checkPermission();
#	Line 1067 | Line 1096 | public class ForkJoinPool extends Abstra
1096		* upon termination, so always returns an empty list. However, you
1097		* can use method {@code drainTasksTo} before invoking this
1098		* method to transfer unexecuted tasks to another collection.
1099	+	*
1100		* @return an empty list
1101		* @throws SecurityException if a security manager exists and
1102		*         the caller is not permitted to modify threads
1103		*         because it does not hold {@link
1104	<	*         java.lang.RuntimePermission}{@code ("modifyThread")},
1104	>	*         java.lang.RuntimePermission}{@code ("modifyThread")}
1105		*/
1106		public List<Runnable> shutdownNow() {
1107		checkPermission();
#	Line 1139 | Line 1169 | public class ForkJoinPool extends Abstra
1169		// Shutdown and termination support
1170
1171		/**
1172	<	* Callback from terminating worker. Null out the corresponding
1173	<	* workers slot, and if terminating, try to terminate, else try to
1174	<	* shrink workers array.
1172	>	* Callback from terminating worker. Nulls out the corresponding
1173	>	* workers slot, and if terminating, tries to terminate; else
1174	>	* tries to shrink workers array.
1175	>	*
1176		* @param w the worker
1177		*/
1178		final void workerTerminated(ForkJoinWorkerThread w) {
#	Line 1172 | Line 1203 | public class ForkJoinPool extends Abstra
1203		}
1204
1205		/**
1206	<	* Initiate termination.
1206	>	* Initiates termination.
1207		*/
1208		private void terminate() {
1209		if (transitionRunStateTo(TERMINATING)) {
#	Line 1349 | Line 1380 | public class ForkJoinPool extends Abstra
1380		* Ensures that no thread is waiting for count to advance from the
1381		* current value of eventCount read on entry to this method, by
1382		* releasing waiting threads if necessary.
1383	+	*
1384		* @return the count
1385		*/
1386		final long ensureSync() {
#	Line 1370 | Line 1402 | public class ForkJoinPool extends Abstra
1402		*/
1403		private void signalIdleWorkers() {
1404		long c;
1405	<	do;while (!casEventCount(c = eventCount, c+1));
1405	>	do {} while (!casEventCount(c = eventCount, c+1));
1406		ensureSync();
1407		}
1408
#	Line 1394 | Line 1426 | public class ForkJoinPool extends Abstra
1426		* Waits until event count advances from last value held by
1427		* caller, or if excess threads, caller is resumed as spare, or
1428		* caller or pool is terminating. Updates caller's event on exit.
1429	+	*
1430		* @param w the calling worker thread
1431		*/
1432		final void sync(ForkJoinWorkerThread w) {
#	Line 1424 | Line 1457 | public class ForkJoinPool extends Abstra
1457		* Returns true if worker waiting on sync can proceed:
1458		*  - on signal (thread == null)
1459		*  - on event count advance (winning race to notify vs signaller)
1460	<	*  - on Interrupt
1460	>	*  - on interrupt
1461		*  - if the first queued node, we find work available
1462		* If node was not signalled and event count not advanced on exit,
1463		* then we also help advance event count.
1464	+	*
1465		* @return true if node can be released
1466		*/
1467		final boolean syncIsReleasable(WaitQueueNode node) {
#	Line 1468 | Line 1502 | public class ForkJoinPool extends Abstra
1502		* spare thread when one is about to block (and remove or
1503		* suspend it later when unblocked -- see suspendIfSpare).
1504		* However, implementing this idea requires coping with
1505	<	* several problems: We have imperfect information about the
1505	>	* several problems: we have imperfect information about the
1506		* states of threads. Some count updates can and usually do
1507		* lag run state changes, despite arrangements to keep them
1508		* accurate (for example, when possible, updating counts
#	Line 1491 | Line 1525 | public class ForkJoinPool extends Abstra
1525		* target counts, else create only to avoid starvation
1526		* @return true if joinMe known to be done
1527		*/
1528	<	final boolean preJoin(ForkJoinTask<?> joinMe, boolean maintainParallelism) {
1528	>	final boolean preJoin(ForkJoinTask<?> joinMe,
1529	>	boolean maintainParallelism) {
1530		maintainParallelism &= maintainsParallelism; // overrride
1531		boolean dec = false;  // true when running count decremented
1532		while (spareStack == null || !tryResumeSpare(dec)) {
1533		int counts = workerCounts;
1534	<	if (dec || (dec = casWorkerCounts(counts, --counts))) { // CAS cheat
1534	>	if (dec || (dec = casWorkerCounts(counts, --counts))) {
1535	>	// CAS cheat
1536		if (!needSpare(counts, maintainParallelism))
1537		break;
1538		if (joinMe.status < 0)
#	Line 1511 | Line 1547 | public class ForkJoinPool extends Abstra
1547		/**
1548		* Same idea as preJoin
1549		*/
1550	<	final boolean preBlock(ManagedBlocker blocker, boolean maintainParallelism){
1550	>	final boolean preBlock(ManagedBlocker blocker,
1551	>	boolean maintainParallelism) {
1552		maintainParallelism &= maintainsParallelism;
1553		boolean dec = false;
1554		while (spareStack == null || !tryResumeSpare(dec)) {
#	Line 1535 | Line 1572 | public class ForkJoinPool extends Abstra
1572		* there is apparently some work to do.  This self-limiting rule
1573		* means that the more threads that have already been added, the
1574		* less parallelism we will tolerate before adding another.
1575	+	*
1576		* @param counts current worker counts
1577		* @param maintainParallelism try to maintain parallelism
1578		*/
#	Line 1554 | Line 1592 | public class ForkJoinPool extends Abstra
1592		/**
1593		* Adds a spare worker if lock available and no more than the
1594		* expected numbers of threads exist.
1595	+	*
1596		* @return true if successful
1597		*/
1598		private boolean tryAddSpare(int expectedCounts) {
#	Line 1613 | Line 1652 | public class ForkJoinPool extends Abstra
1652		* the same WaitQueueNodes as barriers.  They are resumed mainly
1653		* in preJoin, but are also woken on pool events that require all
1654		* threads to check run state.
1655	+	*
1656		* @param w the caller
1657		*/
1658		private boolean suspendIfSpare(ForkJoinWorkerThread w) {
#	Line 1623 | Line 1663 | public class ForkJoinPool extends Abstra
1663		node = new WaitQueueNode(0, w);
1664		if (casWorkerCounts(s, s-1)) { // representation-dependent
1665		// push onto stack
1666	<	do;while (!casSpareStack(node.next = spareStack, node));
1666	>	do {} while (!casSpareStack(node.next = spareStack, node));
1667		// block until released by resumeSpare
1668		node.awaitSpareRelease();
1669		return true;
#	Line 1634 | Line 1674 | public class ForkJoinPool extends Abstra
1674
1675		/**
1676		* Tries to pop and resume a spare thread.
1677	+	*
1678		* @param updateCount if true, increment running count on success
1679		* @return true if successful
1680		*/
#	Line 1652 | Line 1693 | public class ForkJoinPool extends Abstra
1693
1694		/**
1695		* Pops and resumes all spare threads. Same idea as ensureSync.
1696	+	*
1697		* @return true if any spares released
1698		*/
1699		private boolean resumeAllSpares() {
#	Line 1695 | Line 1737 | public class ForkJoinPool extends Abstra
1737		* Interface for extending managed parallelism for tasks running
1738		* in ForkJoinPools. A ManagedBlocker provides two methods.
1739		* Method {@code isReleasable} must return true if blocking is not
1740	<	* necessary. Method {@code block} blocks the current thread
1741	<	* if necessary (perhaps internally invoking isReleasable before
1742	<	* actually blocking.).
1740	>	* necessary. Method {@code block} blocks the current thread if
1741	>	* necessary (perhaps internally invoking {@code isReleasable}
1742	>	* before actually blocking.).
1743	>	*
1744		* <p>For example, here is a ManagedBlocker based on a
1745		* ReentrantLock:
1746	<	* <pre>
1747	<	*   class ManagedLocker implements ManagedBlocker {
1748	<	*     final ReentrantLock lock;
1749	<	*     boolean hasLock = false;
1750	<	*     ManagedLocker(ReentrantLock lock) { this.lock = lock; }
1751	<	*     public boolean block() {
1752	<	*        if (!hasLock)
1753	<	*           lock.lock();
1754	<	*        return true;
1755	<	*     }
1756	<	*     public boolean isReleasable() {
1757	<	*        return hasLock || (hasLock = lock.tryLock());
1715	<	*     }
1746	>	*  <pre> {@code
1747	>	* class ManagedLocker implements ManagedBlocker {
1748	>	*   final ReentrantLock lock;
1749	>	*   boolean hasLock = false;
1750	>	*   ManagedLocker(ReentrantLock lock) { this.lock = lock; }
1751	>	*   public boolean block() {
1752	>	*     if (!hasLock)
1753	>	*       lock.lock();
1754	>	*     return true;
1755	>	*   }
1756	>	*   public boolean isReleasable() {
1757	>	*     return hasLock || (hasLock = lock.tryLock());
1758		*   }
1759	<	* </pre>
1759	>	* }}</pre>
1760		*/
1761		public static interface ManagedBlocker {
1762		/**
1763		* Possibly blocks the current thread, for example waiting for
1764		* a lock or condition.
1765	+	*
1766		* @return true if no additional blocking is necessary (i.e.,
1767		* if isReleasable would return true)
1768		* @throws InterruptedException if interrupted while waiting
1769	<	* (the method is not required to do so, but is allowed to).
1769	>	* (the method is not required to do so, but is allowed to)
1770		*/
1771		boolean block() throws InterruptedException;
1772
#	Line 1740 | Line 1783 | public class ForkJoinPool extends Abstra
1783		* while the current thread is blocked.  If
1784		* {@code maintainParallelism} is true and the pool supports
1785		* it ({@link #getMaintainsParallelism}), this method attempts to
1786	<	* maintain the pool's nominal parallelism. Otherwise if activates
1786	>	* maintain the pool's nominal parallelism. Otherwise it activates
1787		* a thread only if necessary to avoid complete starvation. This
1788		* option may be preferable when blockages use timeouts, or are
1789		* almost always brief.
1790		*
1791		* <p> If the caller is not a ForkJoinTask, this method is behaviorally
1792		* equivalent to
1793	<	* <pre>
1794	<	*   while (!blocker.isReleasable())
1795	<	*      if (blocker.block())
1796	<	*         return;
1797	<	* </pre>
1793	>	*  <pre> {@code
1794	>	* while (!blocker.isReleasable())
1795	>	*   if (blocker.block())
1796	>	*     return;
1797	>	* }</pre>
1798		* If the caller is a ForkJoinTask, then the pool may first
1799		* be expanded to ensure parallelism, and later adjusted.
1800		*
#	Line 1766 | Line 1809 | public class ForkJoinPool extends Abstra
1809		boolean maintainParallelism)
1810		throws InterruptedException {
1811		Thread t = Thread.currentThread();
1812	<	ForkJoinPool pool = (t instanceof ForkJoinWorkerThread?
1813	<	((ForkJoinWorkerThread)t).pool : null);
1812	>	ForkJoinPool pool = ((t instanceof ForkJoinWorkerThread) ?
1813	>	((ForkJoinWorkerThread) t).pool : null);
1814		if (!blocker.isReleasable()) {
1815		try {
1816		if (pool == null ||
#	Line 1782 | Line 1825 | public class ForkJoinPool extends Abstra
1825
1826		private static void awaitBlocker(ManagedBlocker blocker)
1827		throws InterruptedException {
1828	<	do;while (!blocker.isReleasable() && !blocker.block());
1828	>	do {} while (!blocker.isReleasable() && !blocker.block());
1829		}
1830
1831		// AbstractExecutorService overrides

Diff Legend

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