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.130 by jsr166, Mon Aug 13 18:25:53 2012 UTC vs.
Revision 1.134 by jsr166, Sun Oct 21 06:40:20 2012 UTC

#	Line 1047 | Line 1047 | public class ForkJoinPool extends Abstra
1047		ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
1048		}
1049		}
1050	+
1051		/**
1052		* Per-thread records for threads that submit to pools. Currently
1053		* holds only pseudo-random seed / index that is used to choose
#	Line 1300 | Line 1301 | public class ForkJoinPool extends Abstra
1301		*
1302		* @param w the worker's queue
1303		*/
1303	–
1304		final void registerWorker(WorkQueue w) {
1305		Mutex lock = this.lock;
1306		lock.lock();
1307		try {
1308		WorkQueue[] ws = workQueues;
1309		if (w != null && ws != null) {          // skip on shutdown/failure
1310	<	int rs, n =  ws.length, m = n - 1;
1310	>	int rs, n = ws.length, m = n - 1;
1311		int s = nextSeed += SEED_INCREMENT; // rarely-colliding sequence
1312		w.seed = (s == 0) ? 1 : s;          // ensure non-zero seed
1313		int r = (s << 1) | 1;               // use odd-numbered indices
#	Line 1518 | Line 1518 | public class ForkJoinPool extends Abstra
1518		* awaiting signal,
1519		*
1520		* @param w the worker (via its WorkQueue)
1521	<	* @return a task or null of none found
1521	>	* @return a task or null if none found
1522		*/
1523		private final ForkJoinTask<?> scan(WorkQueue w) {
1524		WorkQueue[] ws;                       // first update random seed

Diff Legend

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