ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinWorkerThread.java

Comparing jsr166/src/jsr166y/ForkJoinWorkerThread.java (file contents):
Revision 1.64 by jsr166, Tue Mar 15 19:47:02 2011 UTC vs.
Revision 1.65 by jsr166, Thu Apr 14 01:17:58 2011 UTC

#	Line 332 | Line 332 | public class ForkJoinWorkerThread extend
332		protected void onStart() {
333		queue = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
334		int r = pool.workerSeedGenerator.nextInt();
335	<	seed = (r == 0)? 1 : r; //  must be nonzero
335	>	seed = (r == 0) ? 1 : r; //  must be nonzero
336		}
337
338		/**
#	Line 695 | Line 695 | public class ForkJoinWorkerThread extend
695		Thread.yield();        // for politeness
696		}
697		else
698	<	retries = helpJoinTask(joinMe)? MAX_HELP : retries - 1;
698	>	retries = helpJoinTask(joinMe) ? MAX_HELP : retries - 1;
699		}
700		else {
701		retries = MAX_HELP;           // restart if not done
#	Line 926 | Line 926 | public class ForkJoinWorkerThread extend
926		p.addActiveCount(1);
927		}
928		if ((t = (v != this) ? v.deqTask() :
929	<	locallyFifo? locallyDeqTask() : popTask()) != null) {
929	>	locallyFifo ? locallyDeqTask() : popTask()) != null) {
930		currentSteal = t;
931		t.doExec();
932		currentSteal = ps;

Diff Legend

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