ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/concurrent/ForkJoinPool.java

Comparing jsr166/src/main/java/util/concurrent/ForkJoinPool.java (file contents):
Revision 1.298 by jsr166, Mon Nov 23 17:00:43 2015 UTC vs.
Revision 1.299 by jsr166, Wed Dec 16 02:29:06 2015 UTC

#	Line 133 | Line 133 | import java.util.concurrent.locks.LockSu
133		* @since 1.7
134		* @author Doug Lea
135		*/
136	<	@sun.misc.Contended
136	>	@jdk.internal.vm.annotation.Contended
137		public class ForkJoinPool extends AbstractExecutorService {
138
139		/*
#	Line 752 | Line 752 | public class ForkJoinPool extends Abstra
752		* arrays sharing cache lines. The @Contended annotation alerts
753		* JVMs to try to keep instances apart.
754		*/
755	<	@sun.misc.Contended
755	>	@jdk.internal.vm.annotation.Contended
756		static final class WorkQueue {
757
758		/**
#	Line 789 | Line 789 | public class ForkJoinPool extends Abstra
789		final ForkJoinPool pool;   // the containing pool (may be null)
790		final ForkJoinWorkerThread owner; // owning thread or null if shared
791		volatile Thread parker;    // == owner during call to park; else null
792	<	volatile ForkJoinTask<?> currentJoin;  // task being joined in awaitJoin
793	<	@sun.misc.Contended("group2") // separate from other fields
792	>	volatile ForkJoinTask<?> currentJoin; // task being joined in awaitJoin
793	>
794	>	@jdk.internal.vm.annotation.Contended("group2") // segregate
795		volatile ForkJoinTask<?> currentSteal; // nonnull when running some task
796
797		WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner) {

Diff Legend

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